From: Jan Nieuwenhuizen Date: Mon, 2 Apr 2001 14:43:47 +0000 (+0200) Subject: patch::: 1.3.145.jcn1 X-Git-Tag: release/1.3.146~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=452fce3d93d6caa5670f39835fa62749ed609c8e;p=lilypond.git patch::: 1.3.145.jcn1 1.3.145.jcn1 ============ * Preliminary tutorial fixes. * Ly2dvi: - keep .dvi output when making .ps. - name latex wrapper for foo.ly: foo.latex - keep .tex and .latex output if latex fails - keep .dvi output if dvips fails - replaced --outdir option with --output=FILE option, where FILE may include directories - enhancements and fixes * Typo fix: clean-fonts * Bugfixes: lilypond-login.sh * Tutorial and refman fixes (Mats) --- diff --git a/CHANGES b/CHANGES index 9d10d4a5a6..2416e132ff 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +1.3.145.jcn1 +============ + +* Preliminary tutorial fixes. + +* Ly2dvi: + - keep .dvi output when making .ps. + - name latex wrapper for foo.ly: foo.latex + - keep .tex and .latex output if latex fails + - keep .dvi output if dvips fails + - replaced --outdir option with --output=FILE option, where FILE + may include directories + - enhancements and fixes + +* Typo fix: clean-fonts + +* Bugfixes: lilypond-login.sh + +* Tutorial and refman fixes (Mats) + + 1.3.144.jcn4 ============ diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 08a4b139c5..442e550b07 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -46,7 +46,7 @@ $(outdir)/%.info: $(outdir)/%.texi default: # Info is now built by default via texinfo-rules. -# We must build them by defaulbt, otherwise they get built during make install +# We must build them by default, otherwise they get built during make install info: $(INFO_FILES) diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 9d23b38f20..9556542c6a 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -22,8 +22,10 @@ sequentially. @item -f,--format=@var{format} Output format for sheet music. Choices are tex (for @TeX{} -output), ps (for PostScript) and scm (for a Scheme -dump). +output), ps (for PostScript), scm (for a Scheme +dump), and as (for ASCIIScript). + +@c TODO: TFMFONTS For processing both the @TeX{} and the PostScript output, you must have appropriate environment variables set. For @TeX{}, you have to diff --git a/Documentation/user/ly2dvi.itexi b/Documentation/user/ly2dvi.itexi index e2351c5eae..a1613ad5f4 100644 --- a/Documentation/user/ly2dvi.itexi +++ b/Documentation/user/ly2dvi.itexi @@ -15,33 +15,40 @@ one or more DVI files. @subsection Invoking ly2dvi @example - ly2dvi [options] inputfile[.ly] [....] +ly2dvi [OPTION]... [FILE]... @end example @unnumberedsec Options @table @code -@item -s,--set=@var{KEY}=@var{VAL} - Add @var{key}= @var{val} to the settings, overriding those specified -in the files. Possible keys: language, latexheaders, latexpackages, -papersizename, pagenumber, linewidth, orientation, textheight. - @item -k,--keep Keep the temporary directory including LilyPond and ly2dvi output files. The temporary directory is created in the current directory as @code{ly2dvi.dir}. -@item -P,--postscript - Generate PostScript in stead of DVI. -@item --no-lily - Do not run LilyPond; useful for debugging ly2dvi. +@item -d,--dependencies + Write makefile dependencies for every input file. @item -h,--help Print help. -@item -I,--include - Add to the lilypond include path. -@item -d,--dependencies - Make a dependency file for the output. -@item --outdir=@var{dir} - Generate output (including MIDI files) in @var{dir} - +@item -I,--include=@var{DIR} + Add @var{DIR} to LilyPond's include path. +@item -m,--no-paper + Produce MIDI output only. +@item --no-lily + Do not run LilyPond; useful for debugging ly2dvi. +@item -o,--output=@var{FILE} + Generate output to @var{FILE}. The extension of @var{FILE} is ignored. +@item -P,--postscript + Also generate PostScript output. +@item -s,--set=@var{KEY}=@var{VAL} + Add @var{key}= @var{val} to the settings, overriding those specified +in the files. Possible keys: language, latexheaders, latexpackages, +papersize, pagenumber, linewidth, orientation, textheight. +@item -v,--version +Show version information +@item -V,--verbose +Be verbose +@item -w,--warranty +Show the warranty with which GNU LilyPond comes. (It comes with +@strong{NO WARRANTY}!) @end table @subsection Titling layout @@ -102,14 +109,21 @@ read from the @code{\paper} block, if set. @item linewidth Is read from the @code{\paper} block. -@item papersizename - Specify name of papersize. Is read from the @code{\paper} block. +@item papersize + Specify the papersize. Is read from the @code{\paper} block. +@end table + +@subsection Environment variables + +@item LANG +selects the language for the warning messages of Ly2dvi and LilyPond. @end table @subsection Bugs -Assumes that settings for LilyPond are correct. Assumes that @code{cp} -and @code{rm} are in the path. +Assumes that @code{cp} and @code{rm} are in the path. + +Cannot generate @TeX{} or @code{PostScript} only. If find something that you consider a bug, please send a bugreport (See @ref{Bug reports}) to @email{bug-gnu-music@@gnu.org}. diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 6d9bf7c2c8..77bcf27c3a 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -13,6 +13,59 @@ @end ifnotinfo + +@iftex +@macro separate + +@tex +\\hbox to\\hsize{\\hfill$\\heartsuit$\\hfill} +@end tex + +@end macro +@end iftex + +@c \heartsf was supposed to be filled? + +@c center is broken? +@ifnottex +@macro braakseparate + +@center *** + +@end macro +@end ifnottex + +@ifinfo +@macro separate + +@quotation +@quotation +@quotation +@quotation +@quotation +@quotation +*** +@end quotation +@end quotation +@end quotation +@end quotation +@end quotation +@end quotation +@end macro +@end ifinfo + +@ifhtml +@macro separate +@html +

***

+@end html +@end macro +@end ifhtml + +@c netscape 4.x doesn't handle html chars 4.0 :-( +@c

♥

+@c

***

+ @ignore @c Huh, do outline mode and texinfo really fight eachother? diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index dc98e0196c..e7a3d60a7f 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -83,8 +83,8 @@ calculated. During these stages different types of data play the the main role: during parsing, @strong{Music} objects are created. During the -interpretation, @strong{context} is constructed, and with this context -af network of @strong{graphical objects} (``grobs'') is created. The +interpretation, @strong{context}s are constructed, and with these contexts +a network of @strong{graphical objects} (``grobs'') is created. These grobs contain unknown variables, and the network forms a set of equations. After solving the equations and filling in these variables, the printed output (in the form of @strong{molecules}) is written to an @@ -93,7 +93,7 @@ output file. These threemanship of tasks (parsing, translating, typesetting) and data-structures (music, context, graphical objects) permeates the entire design of the program. This manual is ordered in terms of user -tasks. With each concept will be explained to which of the three parts +tasks. For each concept, it will be explained to which of the three parts it belongs. @@ -235,7 +235,7 @@ r1 r2 r4 r8 r16 r32 r64 r64 @lilypond[] \score { \notes \relative c'' { - \breve \autoBeamOff + a\longa a\breve \autoBeamOff a1 a2 a4 a8 a16 a32 a64 a64 r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r64 @@ -323,7 +323,8 @@ Hal-Leonard Inc. music publishers. Note that @code{EasyNotation} overrides a @code{Score} context. You probably will want to print it with magnification to make it better -readable. +readable, see @ref{Output scaling}. + @cindex Xdvi @cindex ghostscript @@ -2879,10 +2880,14 @@ The style sheets and tables for selecting fonts are located in @refbugs -Relative size is not linked to any real size. There is no mechanism to -select magnifications of fonts, meaning that you can not scale fonts -continuoussly. There is no style sheet provided for other fonts besides -the @TeX{} family. +Relative size is not linked to any real size. + +There is no mechanism to select magnification of particular fonts, +meaning that you don't have access to continuously scaled fonts. You +can scale the entire output, of course, see @ref{Output scaling}. + +There is no style sheet provided for other fonts besides the @TeX{} +family. @cindex font selection @cindex font magnification @@ -3133,6 +3138,7 @@ use are in @code{staff-space}s. * Paper size:: * Line break:: * Page break:: +* Output scaling:: @end menu @c . {Paper block} @@ -3282,12 +3288,6 @@ The file @code{paper16.ly} will now include a file named @file{a4.ly}, which will set the paper variables @code{hsize} and @code{vsize} (used by @code{ly2dvi}) - - - - - - @c . {Line break} @node Line break @subsection Line break @@ -3337,6 +3337,28 @@ direct control of LilyPond. However, you can insert a commands into the details, see the example file @file{input/test/between-systems.ly} + +@c . {Output scaling} +@node Output scaling +@subsection Output scaling + +[TODO] + +@example +dvips ... +@end example + +@example +pstops ... +@end example + + +@refbugs +There is no mechanism to select magnification of particular fonts, +meaning that you don't have access to continuously scaled fonts. + + + @c . {Output formats} @node Output formats @section Output formats diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 4f14ac7c40..4a6f5f11a8 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1,13 +1,13 @@ @c -*-texinfo-*- +@c TODO: LilyPond Lilypond lilypond + @node Tutorial @chapter Tutorial - - LilyPond prints music from a specification that you, the user, supply. -You have to give that specification using a @emph{language}. This -chapter is a gentle introduction to that language. +You have to give that specification using a textual @emph{language}. +This chapter is a gentle introduction to that language. This tutorial will demonstrate how to use Lilypond by presenting examples of input along with resulting output. We will use English @@ -19,7 +19,8 @@ consult the glossary that is distributed with LilyPond. The examples discussed are included in the distribution, in the subdirectory @file{input/tutorial/}@footnote{When we refer to filenames, they are relative to the top directory of the source -package. +package. In binary installations you should look in your doc section, +eg, @code{/usr/share/doc/lilypond1.3/examples/input/tutorial} @cindex file names }. We recommend that you experiment with writing Lilypond input yourself, to get a feel for how the program behaves. @@ -40,97 +41,90 @@ yourself, to get a feel for how the program behaves. @node Running LilyPond @section Running LilyPond - -[describe all programs involved in one list.] +[FIXME refman: describe all programs involved in one list.] Before we dive into describing the input language of LilyPond, we first show you through the procedure for getting notes on your screen and out of your printer. -The first step is creating an input file. Using your favorite +The first step is creating an input file. Using your favorite text-editor, create @file{test.ly} containing -@example -\header @{ - title = "Test"; -@} +@ignore + +NOTE: if you're reading this, ie, the Texinfo source itself, test.ly +should of course contain: + + \score{ + \notes { c'4 e' g' } + } +@end ignore + +@example \score @{ - \notes @{ c'4 e'4 g'4 @} - \paper @{ @} + \notes @{ c'4 e' g' @} @} @end example @unnumberedsubsec Unix - @cindex Unix, Running lilypond on +@cindex ly2dvi + +On unix, you invoke ly2dvi to compile your lilypond source file (you can +omit the @code{.ly}): -If you run Unix, proceed as follows: run lilypond on the file, i.e., @example - lilypond test +ly2dvi -P test @end example + You will see the following on your screen: + @example -GNU LilyPond 1.3.125. -Now processing: `input/tutorial/test.ly' +GNU LilyPond 1.3.145 +Now processing: `/home/fred/ly/test.ly' Parsing... Interpreting music...[1] Preprocessing elements... Calculating column positions... [2] paper output to test.tex... + +Analyzing test.tex... +Running LaTeX... +Running dvips... +PS output to test.ps... +DVI output to test.dvi... @end example -Now, run @TeX{}@footnote{@TeX{} is a text-typesetting system that is -especially suited for typesetting mathematics.}. The result should -resemble this: -@example -This is TeX, Version 3.14159 (Web2C 7.3.1) -(test.tex (/home/hanwen/usr/share/lilypond/tex/lilyponddefs.tex -(/home/hanwen/usr/share/lilypond/tex/lilypond-plaintex.tex -LilyPond Plain TeX settings) (/home/hanwen/usr/src/ ... -(/home/hanwen/usr/share/lilypond/tex/lily-ps-defs.tex) [footer empty] -(/home/hanwen/usr/share/lilypond/tex/fetdefs.tex)) [1] ) -Output written on test.dvi (1 page, 3716 bytes). -Transcript written on test.log. -@end example -The result of the @TeX{} run is a @TeX{} ``DeVice Independent'' file -(@file{test.dvi}). +The results of the ly2dvi run are a ``DeVice Independent'' file +(@file{test.dvi}) and a PostScript file (@file{test.ps}). + @cindex DVI file -@cindex @TeX{} @cindex Viewing music -@cindex @code{xdvi} -To view the output, run Xdvi, i.e. +@cindex xdvi +@cindex .dvi + +To view the @code{test.dvi} output, run Xdvi (you may omit the +@code{.dvi}): + @example - xdvi test +xdvi test @end example + You should see the following in a window next to some buttons. @lilypond -\header { - title = "Test"; -} - \score { - \notes { c'4 e'4 g'4 } - \paper { } + \notes { c'4 e' g' } } @end lilypond -@cindex postscript, converting to -When you're satisfied with the result, you can print it. For printing, -you have to generate a postscript file: -@example - dvips -o test.ps test.dvi -@end example -which looks like this: -@example -This is dvips(k) 5.86 Copyright 1999 Radical Eye Soft ... -' TeX output 2001.01.27:1806' -> test.ps -. [1] -@end example +When you're satisfied with the result, you can print the PostScript +file. @cindex PostScript @cindex Printing output +@cindex .ps @cindex GhostScript @cindex @code{lpr} PostScript is a page description language, similar to PDF. Some printers @@ -141,43 +135,42 @@ GhostScript running ``in the background'', so any configured printer will act as a PostScript printer. Assuming this, the following command will print the file @example - lpr test.ps +lpr test.ps @end example If this does not make your printer produce a page of music, then you should look into installing and configuring ghostscript. Refer to GhostScript's website at @uref{http://www.ghostscript.com}. -There are three other routes: firstly, you can add titling to the -output. This is done by a separate program called @file{ly2dvi}: this -program first calls LilyPond to process the @file{.ly} file, and then -runs @TeX{} on it to produce a @file{.dvi} file with proper margin -settings and titling. - -@cindex titles, adding -@cindex ly2dvi +There are three other routes. Firstly, there is a script called +@code{lilypond-book}, that allows you to freely mix LilyPond input with +Texinfo or LaTeX input. For example, this manual was written using +@code{lilypond-book}. It is discussed in @ref{lilypond-book}. +@c FIXME: ly2dvi option? +Secondly, you can generate PostScript directly. This is useful if you +can not or do not want to run @TeX{} on your system. To obtain direct +PostScript output, invoke LilyPond as follows: +@cindex PostScript output @example - ly2dvi test.ly +lilypond -f ps test.ly @end example -After some disk-activity, you should end up with a @file{.dvi} file. -Ly2dvi is further described in the @ref{ly2dvi}. +You have to set some environment variables to view or print this +output. More information can be found in @ref{Invoking +LilyPond}. -Secondly, you can generate PostScript directly. This is useful if you -can not or do not want to run @TeX{} on your system. -To obtain PS output, invoke LilyPond as follows: -@cindex PostScript output +@c FIXME: ly2dvi option? +Thirdly, if you want to do special things with your output, you can run +invoke lilypond directly: @example - lilypond -f ps test.ly +lilypond test.ly @end example +to produce plain @TeX{}@footnote{@TeX{} is a text-typesetting system +that is especially suited for typesetting mathematics.} output. Note +that you must run @TeX{} on the resulting @file{test.tex}, ie, not +LaTeX. +@cindex @TeX{} -You have to set some environment variables to view or print this -output. More information can be found in the @ref{Invoking -LilyPond}. -Finally, there is a script called @code{lilypond-book}, that allows you -to freely mix LilyPond input with Texinfo or LaTeX input. For example, -this manual was written using @code{lilypond-book}. It is discussed in -@ref{lilypond-book}. @unnumberedsubsec Windows @@ -199,8 +192,8 @@ is included in the distribution as @file{menuet.ly}. @cindex Bach, Johann Sebastian @lilypond[verbatim] -% lines preceded by a percent are comments which -% are ignored by Lilypond. +% text preceded by a percent sign is a comment +% and is ignored by Lilypond \include "paper16.ly" \score { \notes @@ -231,18 +224,19 @@ is included in the distribution as @file{menuet.ly}. } @end lilypond -We will analyse the input, line by line. +We will analyse the input, line by line. +@separate @example - % lines preceded by a percent are comments which - % are ignored by Lilypond. + % text preceded by a percent sign is a comment + % and is ignored by LilyPond @end example The percent sign, @code{%}, introduces a line comment. If you want to -make larger comments, you can use block comments. These are delimited -by @code{%@{} and @code{%@}} +make a comment that use several lines, you can use block comments. These +are delimited by @code{%@{} and @code{%@}} @cindex comment @cindex block comment @cindex line comment - +@separate @example \include "paper16.ly" @@ -251,11 +245,12 @@ by @code{%@{} and @code{%@}} @cindex @code{\include} @cindex point, printer's @cindex staff size setting -By default, LilyPond will use definitions for a staff that is 20 -point@footnote{A point is the standard measure of length for printing; -one point is 1/72.27 inch.} high. We want smaller +By default, LilyPond will typeset the music in a size such that each +staff is 20 point@footnote{A point is the standard measure of length for +printing; one point is 1/72.27 inch.} high. We want smaller output (16 point staff height), so we must import the settings for that size, which is done here. +@separate @example \score @{ @@ -263,12 +258,14 @@ size, which is done here. @end example Music is printed by combining a chunk of music with directions for outputting it. This combination is formed in the @code{\score} block. +@separate @example \notes @end example This makes LilyPond ready for accepting notes. +@separate @example \relative c'' @@ -277,22 +274,24 @@ outputting it. This combination is formed in the @code{\score} block. @cindex octaves, choosing @cindex pitch -As we will see, pitches are combinations of octave, note name and -chromatic alteration. In this scheme, the octave is indicated by -using raised quotes (@code{'}) and ``lowered'' quotes (commas: -@code{,}). The central C is denoted by @code{c'}. The C one octave -higher is @code{c''}. One and two octaves below the central C is -denoted by @code{c} and @code{c,} respectively. +As we will see, each note is described by its note name, duration, +octave and possibly a chromatic alteration. In this scheme, the +octave is indicated by using raised quotes (@code{'}) and ``lowered'' +quotes (commas: @code{,}). The central C is denoted by @code{c'}. +The C one octave higher is @code{c''}. One and two octaves below +the central C is denoted by @code{c} and @code{c,} respectively. @cindex relative -For pitches in a long piece you might have to type many quotes. It is -easy to make typing errors with this, so LilyPond has a special entry -mode to remedy this. In this ``relative'' octave mode, octaves of notes +Even though a piece of music often spans a range of several octaves, +it mostly moves in small intervals. LilyPond has a special entry +mode to save typing in this situation. In this ``relative'' octave +mode, octaves of notes without quotes are chosen such that a note is as close as possible (graphically, on the staff) to the preceding note. If you add a high-quote an extra octave is added. The lowered quote (a comma) will subtract an extra octave. Because the first note has no predecessor, you have to give the (absolute) pitch of the note to start with. +@separate @example \sequential @{ @@ -301,6 +300,7 @@ you have to give the (absolute) pitch of the note to start with. What follows is sequential music, i.e., @cindex sequential music notes that are to be played and printed after each other. +@separate @example \time 3/4; @@ -308,9 +308,10 @@ notes that are to be played and printed after each other. @end example @cindex time signature, setting @cindex @code{\time} - This command changes the time signature of the current piece: a 3/4 -sign is printed. The time signature setting is also used to generate -bar lines in the right spots. + This command sets or changes the time signature of the current piece: +a 3/4 sign is printed. The time signature setting is also used to generate +bar lines at the right spots. +@separate @example \key g \major; @@ -319,18 +320,20 @@ bar lines in the right spots. @cindex key signature, setting @cindex @code{\key} This command changes the current key signature to G-major. Although this -command comes after the @code{\time} command, in the output, the key -signature comes before the time signature: LilyPond knows about music +command comes after the @code{\time} command, the key signature comes +before the time signature in the output; LilyPond knows about music typesetting conventions. +@separate @example \repeat "volta" 2 @end example - This command tells LilyPond that the following piece of music must be + This command tells LilyPond that the following piece of music is played twice. The first argument indicates the type of repeat. In this -case, @code{"volta"} means that volta brackets are be used for -alternatives---if there were any. +case, @code{"volta"} means that prima volta/secunda volta brackets are +used for the alternative endings---if there were any. +@separate @example @{ @@ -339,15 +342,17 @@ alternatives---if there were any. The subject of the repeat is again sequential music. Since @code{\sequential} is such a common construct, a shorthand is provided: just leave off @code{\sequential}, and the result is the same. +@separate @example d4 @end example - This is a note with pitch @code{d} (determined up to octaves). The + This is a note with pitch @code{d} (determined up to the octave). The relative music was started with a @code{c''}, so the real pitch of this note is @code{d''}. A number designates the duration of the note, so the @code{4} here represents a quarter note. +@separate @example a b @@ -356,6 +361,7 @@ the @code{4} here represents a quarter note. These are notes with pitch @code{a} and @code{b}. Because their duration is the same as the @code{g}, there is no need to enter the duration, but you may enter it anyway, i.e., @code{a4 b4} +@separate @example d4 g, g | @@ -366,7 +372,7 @@ duration, but you may enter it anyway, i.e., @code{a4 b4} @cindex errors, finding Three more notes. The @code{|} character is a `bar check'. When processing the music, LilyPond will verify that bar checks are found at -the start of a measure. This can help you track down errors. +the start of a measure. This can help you track down typing errors. @cindex alteration, chromatic @cindex chromatic alteration @@ -375,13 +381,15 @@ that is: @code{fis}. Lilypond by default uses Dutch note names, and ``Fis'' is the Dutch note name for ``F sharp''. However, there is no sharp sign in the output. The program keeps track of key signatures, and will only print accidentals if they are needed. +@separate @example c8 d e fis @end example LilyPond guesses were beams can be added to eighth and shorter notes. -In this case, a beam over 4 eighths is added. +In this case, a beam is added over the 4 eights. +@separate @example c4 d8( )c b a( )b4 c8 b a g | @@ -390,7 +398,8 @@ In this case, a beam over 4 eighths is added. The next line shows how to make a slur: the beginning and ending note of the slur is marked with an opening and closing parenthesis respectively. In the line shown above, this is done for two slurs. -Slur markers (parentheses) are put between the slurred notes. +Slur markers (parentheses) are entered between the slurred notes. +@separate @example a4 [b8 a] [g fis] @@ -398,6 +407,7 @@ Slur markers (parentheses) are put between the slurred notes. @end example Automatic beaming can be overridden by inserting beam marks (brackets). Brackets are put around the notes you want beamed. +@separate @example g2. | @@ -406,6 +416,7 @@ Automatic beaming can be overridden by inserting beam marks @cindex augmentation dot @cindex dot A period adds an augmentation dot to the note. +@separate @example @} @@ -413,24 +424,27 @@ A period adds an augmentation dot to the note. @end example This ends the sequential music to be repeated. LilyPond will typeset a repeat bar. +@separate @example cis'4 b8 cis a4 | @end example - This line shows that Lily will print an accidental if that is -needed: the first C sharp of the bar will be printed with an accidental, + This line shows that Lily will print an accidental if necessary: +the first C sharp of the bar will be printed with an accidental, the second one without. +@separate @example a8-. b-. cis-. d-. e-. fis-. @end example @cindex articulation -You can enter articulation signs either in a verbose form using a +You can enter articulation signs either in a verbose form or using a shorthand. Here we demonstrate the shorthand: it is formed by a dash and the character for the articulation to use, e.g. @code{-.} for staccato as shown above. +@separate @example fis a, r8 cis8 @@ -438,6 +452,7 @@ staccato as shown above. @end example Rests are denoted by the special notename @code{r}. +@separate @example d2.-\fermata @@ -450,13 +465,17 @@ is a shorthand for a more complicated description of a fermata symbol. identifier. @cindex identifier @cindex @code{\fermata} +@separate +@example + \bar "|."; +@end example +@separate @example - @} - @end example - Here the music ends. + +@separate @example \paper @{ @@ -464,11 +483,13 @@ Here the music ends. @} @end example -This specifies a conversion from music to notation output. Most of -the details of this conversions (font sizes, dimensions, etc.) have +This specifies how the entered music should be converted to notation +output. Most of the details of the conversion (font sizes, dimensions, +etc.) have been taken care of, but to fit the output in this document, it has -to be smaller. We do this by setting the line width to 14 centimeters +to be narrower. We do this by setting the line width to 14 centimeters (approximately 5.5 inches). +@separate @example @} @@ -580,6 +601,7 @@ accompaniment =\chords { @end lilypond Again, we will dissect the file line by line. +@separate @example \header @{ @@ -590,6 +612,7 @@ Information about the music you are about to typeset goes into a @code{\header} block. The information in this block is not used by LilyPond, but it is passed into the output. @file{ly2dvi} uses this information to print titles above the music. +@separate @example title = "The river is flowing"; @@ -597,18 +620,19 @@ information to print titles above the music. @end example @cindex assignments @cindex identifier assignment -the @code{\header} block contains assignments. An assignment starts -with a string. (which is unquoted, in this case). Then comes the -equal sign. After the equal sign comes the expression you -want to store. In this case, you want to put in strings. The -information has to be quoted here, because it contains spaces. Each -assignment is finished with a semicolon. +the @code{\header} block contains assignments. In each assignment, a +variable is set to a value. Lexically, both the variable name and the +assigned value are strings. The values have to be quoted here, because +they contain spaces, the variable names could also be put within quotes +but it is not necessary. Each assignment is finished with a semicolon. +@separate @example \include "paper16.ly" @end example Smaller size for inclusion in a book. +@separate @example melody = \notes \relative c' @{ @@ -619,6 +643,7 @@ The structure of the file will be the same as the previous one, a give names to the different parts of music, and use the names to construct the music within the score block. +@separate @example \partial 8; @end example @@ -626,11 +651,13 @@ construct the music within the score block. @cindex @code{\partial} @cindex anacrusis The piece starts with an anacrusis of one eighth. +@separate @example \key c \minor; @end example The key is C minor: we have three flats. +@separate @example c4 c8 d [es () d] c4 | f4 f8 g [es() d] c g | @@ -643,13 +670,15 @@ The key is C minor: we have three flats. @cindex automatic beaming, turning off We use explicit beaming. Since this is a song, we turn automatic beams off, and use explicit beaming where needed. +@separate @example @} @end example This ends the definition of @code{melody}. Note that there are no -semicolons after assignments at top level. +semicolons after assignments at the top level. +@separate @example text = \lyrics @{ @@ -663,6 +692,7 @@ Lyrics are formed by syllables that have duration, and not by notes. To make LilyPond parse words as syllables, switch it into lyrics mode with @code{\lyrics}. Again, the brace after @code{\lyrics} is a shorthand for @code{\sequential @{}. +@separate @example The4 ri -- ver is flo- __ wing, flo -- wing and gro -- wing, the @@ -677,6 +707,7 @@ extenders by entering @code{__}, and centered hyphens with @code{-}@code{-}. We enter the syllables as if they are all quarter notes in length (hence the @code{4}), and use a feature to align the syllables to the music, which obviously isn't all quarter notes. +@separate @example accompaniment =\chords @{ @@ -684,16 +715,18 @@ syllables to the music, which obviously isn't all quarter notes. @end example @cindex chords @cindex mode, chords -We'll put chords over the music. To enter them, there is a special mode +We'll put chords over the music. To enter them, there is a special mode analogous to @code{\lyrics} and @code{\notes} mode, where you can give -the names of the chords you want, instead of the notes comprising the -chord. +the names of the chords you want, instead of listing the notes +comprising the chord. +@separate @example r8 @end example There is no accompaniment during the anacrusis. +@separate @example c2:3- f:3-.7 @@ -705,10 +738,11 @@ There is no accompaniment during the anacrusis. @cindex modifier, chord A chord is started by the tonic of the chord. The first one lasts a half note. An unadorned note creates a major -triad, while a minor triad is wanted. @code{3-} modifies the third to -be small. @code{7} modifies (adds) a seventh, which is small by default -to create the @code{f a c es} chord. Multiple modifiers must be -separated by a dot. +triad. Since a minor triad is wanted, @code{3-} is added to modify the +third to be small. @code{7} modifies (adds) a seventh, which is small by +default to create the @code{f a c es} chord. Multiple modifiers must be +separated by dots. +@separate @example d:min es4 c8:min r8 @@ -717,6 +751,7 @@ separated by a dot. Some modifiers have predefined names, eg. @code{min} is the same as @code{3-}, so @code{d-min} is a minor @code{d} chord. +@separate @example c2:min f:min7 g:7^3.5 c:min @} @@ -729,6 +764,7 @@ to be separated by a dot. Tones from a chord are removed with chord subtractions. Subtractions are started with a caret, and they are also separated by dots. In this example, @code{g:7^3.5} produces a minor seventh. The brace ends the sequential music. +@separate @example \score @{ @@ -739,6 +775,7 @@ We assemble the music in the @code{\score} block. Melody, lyrics and accompaniment have to sound at the same time, so they should be @code{\simultaneous}. @cindex @code{\simultaneous} +@separate @example %\accompaniment @@ -749,6 +786,7 @@ you remove the comment sign, you can see the chords in normal notation: they will be printed as note heads on a separate staff. To print them as chords names, they have to be interpreted as being chords, not notes. This is done with the following command: +@separate @example \context ChordNames \accompaniment @@ -773,6 +811,7 @@ mechanism in action. We don't want that default here, because we want chord names. The command above explicitly creates an interpretation context of @code{ChordNames} type to interpret the music @code{\accompaniment}. +@separate @example \addlyrics @@ -782,13 +821,14 @@ command above explicitly creates an interpretation context of @cindex lyrics and melody, combining @cindex combining lyrics and melody -The lyrics need to be aligned with the melody. This is done by +The lyrics should be aligned with the melody. This is done by combining both with @code{\addlyrics}. @code{\addlyrics} takes two pieces of music (usually a melody and lyrics, in that order) and aligns the syllables of the second piece under the notes of the first piece. If you would reverse the order, the notes would be aligned on the lyrics, which is not very useful, and looks silly. +@separate @example \context Staff = mel @{ @@ -801,6 +841,7 @@ before the ``note heads'' version of the accompaniment, the accompaniment will be on a nameless staff. The melody has to be on a different staff as the accompaniment. This is accomplished by giving the melody staff a different name. +@separate @example \property Staff.noAutoBeaming = ##t @@ -809,14 +850,15 @@ the melody staff a different name. @cindex \property @cindex context variables @cindex setting context variables -An interpretation context has variables that tune its behaviour. One of +An interpretation context has variables, called properties, that tune +its behaviour. One of the variables is @code{noAutoBeaming}. If set to @code{##t}, which is the boolean value @var{true}, LilyPond will not try to put automatic beaming on the current staff. @cindex GUILE @cindex Scheme -@cindex accessinng Scheme +@cindex accessing Scheme @cindex evaluating Scheme @cindex LISP @@ -833,6 +875,7 @@ create beautiful sheet music. +@separate @example \property Staff.automaticMelismata = ##t @@ -842,8 +885,9 @@ create beautiful sheet music. @cindex melismata @cindex @code{\addlyrics} and slurs Similarly, we don't want to print a syllable when there is -a slur. This sets up @code{\addlyrics} to not put lyrics under notes -while there is a slur. +a slur. This sets up @code{\addlyrics} to not put lyrics under each +separate note while there is a slur. +@separate @example \melody @@ -854,6 +898,7 @@ Finally, we put the melody on the current staff. Note that the @code{\property} directives and @code{\melody} are grouped in sequential music, so the property settings are done before the melody is processed. +@separate @example \context Lyrics \text @@ -863,28 +908,31 @@ The second argument of @code{\addlyrics} is the text. The text also should not land on a Staff, but on a interpretation context for syllables, extenders, hyphens etc. This context is called Lyrics. +@separate @example @} @end example This ends @code{\simultaneous}. +@separate @example \midi @{ \tempo 4=72;@} @end example -MIDI (Musical Instrument Digitial Interface) is a standard for +MIDI (Musical Instrument Digital Interface) is a standard for connecting and recording digital instruments. So a MIDI file is like a tape recording of an instrument. The @code{\midi} block causes makes the music go to a MIDI file, so you can listen to the music you entered. It is great for checking the music. Whenever you hear something weird, you probably hear a typing error. -Syntactally, @code{\midi} is similar to @code{\paper @{ @}}, since it +Syntactically, @code{\midi} is similar to @code{\paper @{ @}}, since it also specifies an output method. You can specify the tempo using the @code{\tempo} command, in this case the tempo of quarter notes is set to 72 beats per minute. +@separate @example \paper @{ linewidth = 10.0\cm; @} @@ -907,7 +955,7 @@ The first thing it does, is running LilyPond on the input file. After some calculations, a @file{.tex} is produced. The contents of this file are very low-level instructions. -For example, the following file (@file{minatures.ly}) +For example, the following file (@file{miniatures.ly}) @example \version "1.3.124"; @@ -995,11 +1043,12 @@ instructions for the title and page layout. A fragment might look like @file{ly2dvi} runs it through LaTeX. LaTeX is a text-formatting system built on top of @TeX{}. It's very popular in the academic world. If LaTeX is successful, this will produce a @file{.dvi} file, containing both the -titling and notes. @code{ly2dvi} completes its task by deleting the two -temporary files, leaving only @file{miniatures.dvi}. +titling and the actual music. @code{ly2dvi} completes its task by +deleting the two temporary files, leaving only @file{miniatures.dvi}. -Next, now we'll look at the examples line by line to explain new things. +Next, now we'll look at the example line by line to explain new things. +@separate @example \version "1.3.124"; @end example @@ -1010,14 +1059,16 @@ version number will be checked, and you will get a warning when the file is too old. This version number is also used by the @code{convert-ly} program (See -@ref{convert-ly}), which uses it update the file to the latest lily +@ref{convert-ly}), which uses it to update the file to the latest lily version. +@separate @example \header @{ title = "Two miniatures"; @} @end example This sets the titling information for the entire file. +@separate @example #(set! point-and-click line-column-location) @end example @@ -1031,8 +1082,9 @@ synchronize the .ly file, the sheet music on your lap and the sheet music on the screen. The point-and-click mechanism makes it easy to find the origin of an error in the .ly file: when you view the file with Xdvi and click on a note , your editor will jump to the spot where that -note was entered. More information is in in @ref{Point and click} +note was entered. More information is in @ref{Point and click} +@separate @example \paper @{ @end example @@ -1042,6 +1094,7 @@ The @code{\score} blocks that follow in the file don't have paper block, at top-level, i.e. not in a @code{\score} block sets the default page layout. +@separate @example linewidth = -1.0; @} @end example @@ -1054,6 +1107,7 @@ the page. However, a negative value has a special meaning. If score, and the spacing is set to natural length: a short phrase takes up little space, a longer phrase more space. +@separate @example \score @{ \notes @{ c'4 d'4 @} @@ -1073,6 +1127,7 @@ easily spotted. However, if you write LilyPond input, either by hand (ie. composing) or by computer, absolute octaves are probably less work. +@separate @example \header @{ @end example @@ -1080,10 +1135,11 @@ easily spotted. However, if you write LilyPond input, either by hand The @code{\header} is normally at the top of the file, where it sets values for the rest of the file. If you want to typeset different pieces from one file (for example, if there are multiple movements, or if -you're making a excercise book), you can put different @code{\score} +you're making an exercise book), you can put different @code{\score} blocks into the input file. ly2dvi will assemble all LilyPond output files into a big document. The contents of \header blocks specified within each score, are used for the titling of each movement. +@separate @example opus = "Opus 1."; piece = "Up"; @} @@ -1117,7 +1173,7 @@ viola = \notes \relative c' \context Voice = viola { oboes = \notes \relative c'' \context Voice = oboe { \stemUp s4 g8. b,16 c8 r - \grace \times 2/3 { } + \grace \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } \context Voice = oboeTwo { @@ -1134,7 +1190,7 @@ oboes = \notes \relative c'' \context Voice = oboe { } hoomPah = \repeat unfold 8 - \notes \transpose c' { \stemUp c8 \stemBoth \stemDown c'8 \stemBoth } + \notes \transpose c' { \stemUp c8 \stemBoth \stemDown c'8 \stemBoth } bassvoices = \notes \relative c' { c4 g8. b,16 @@ -1166,6 +1222,7 @@ bassvoices = \notes \relative c' { If it looks like incomprehensible gibberish to you, then you are right. This example has been doctored to have as many quirks as possible. +@separate @example stemDown = \property Voice.Stem \override #'direction = #-1 @end example @@ -1181,10 +1238,11 @@ setting determine the fonts, offsets, sub-routines to be called on the grob, etc. The initial values of these settings are set in the Scheme file @file{scm/grob-description.scm}. -This statement adds a the setting for all Stem grobs in the current +This statement adds a setting for all Stem grobs in the current Voice: @code{direction} is set to @code{-1}, which encodes down. The setting remains in effect until it is reverted. +@separate @example \property Voice.Stem \revert #'direction @end example @@ -1194,11 +1252,12 @@ precisely one @code{\stemDown} or @code{\stemUp} is neutralised. LilyPond includes the identifiers @code{\stemUp}, @code{\stemDown} along -with some more often used formatting instructions, but to explain how it -works, we wrote our own here. Of course, you should use predefined +with some other commonly used formatting instructions, but to explain how +it works, we wrote our own here. Of course, you should use predefined identifiers like these if possible: then you will be affected less by the implementation changes we occasionally make. +@separate @example viola = \notes \relative c' \context Voice = viola @{ @end example @@ -1209,6 +1268,7 @@ stems and dynamics (among others). The name of this context is precisely one @code{Voice} context, so we give it an unique name (`@code{viola}'). +@separate @example @end example @@ -1229,11 +1289,13 @@ note. @code{\arpeggio} draws an vertical wavy line before the chord, signifying an arpeggio. +@separate @example \stemDown @end example +@separate @example g'8. b,16 @end example @@ -1242,6 +1304,7 @@ point for the note following a chord is the first note of the chord. So the @code{g} gets an octave up quote: it is a fifth above the starting note of the previous chord (the central C). +@separate @example s1 s2. r4 @end example @@ -1250,6 +1313,7 @@ the duration of a rest. It is useful for filling up voices that temporarily don't play. In this case, the viola doesn't come until one and a half measure later. +@separate @example oboes = \notes \relative c'' \context Voice = oboe @{ @end example @@ -1257,11 +1321,13 @@ Now comes a part for two oboes. They play homophonically, so we print the notes as one voice that makes chords. Again, we insure that these notes are indeed processed by precisely one context with @code{\context}. +@separate @example \stemUp s4 g8. b,16 c8 r @end example @code{\stemUp} is a reference to the @code{\property \override} command defined above. +@separate @example \grace < d4 f> @end example @@ -1277,6 +1343,7 @@ The slur started on the @code{e} of the chord will be attached to the next note.@footnote{LilyPond will squirm about unended Slurs. In this case, you can ignore the warning}. @end ignore +@separate @example \times 2/3 @end example @@ -1286,6 +1353,7 @@ Tuplets are made with the @code{\times} keyword. It takes two arguments: a fraction and a piece of music. The duration of the piece of music is multiplied by the fraction. Triplets make notes occupy 2/3 of their notated duration, so in this case the fraction is 2/3. +@separate @example @{ @} @end example @@ -1298,6 +1366,7 @@ to the preceding note, the @code{d}. @cindex crescendo @cindex @code{\<} +@separate @example < @end example @@ -1305,6 +1374,7 @@ At this point, the homophonic music splits into two rhythmically different parts. We can't use a sequence of chords to enter this, so we make a `chord' of sequences to do it. We start with the upper voice, which continues with upward stems: +@separate @example @{ \times 2/3 @{ a8 g c @} \! c2 @} @end example @@ -1313,6 +1383,7 @@ voice, which continues with upward stems: The crescendo is ended at the half note by the escaped exclamation mark @code{\!}. +@separate @example \context Voice = oboeTwo @{ \stemDown @@ -1320,6 +1391,7 @@ mark @code{\!}. We can't share stems with the other voice, so we have to create a new @code{Voice} context. We give it the name @code{oboeTwo} to distinguish it from the other context. Stems go down in this voice. +@separate @example \grace @{ @end example @@ -1330,6 +1402,7 @@ its own time bookkeeping, and you can make notes, beams, slurs etc. Here we fiddle with a property and make a beam. The argument of @code{\grace} is sequential music. +@separate @example \property Grace.Stem \override #'direction = #-1 [f,16 g] @} @@ -1341,12 +1414,14 @@ voice interferes. We set the stems down here. As far as relative mode is concerned, the previous note is the @code{c'''2} of the upper voice, so we have to go an octave down for the @code{f}. +@separate @example f8 e e2 @} > @end example This ends the two-part section. +@separate @example \stemBoth \grace <)b8. d8.-\trill> | @@ -1359,12 +1434,14 @@ positioned as if it were single part music. The bass has a little hoom-pah melody to demonstrate parts switching between staffs. Since it is repetitive, we use repeats: +@separate @example hoomPah = \repeat unfold 8 @end example @cindex unfolded @code{\repeat} The unfolded repeat prints the notes in its argument as if they were -written out in full. +written out in full eight times. +@separate @example \notes \transpose c' @{ @end example @@ -1374,12 +1451,13 @@ written out in full. Transposing can be done with @code{\transpose}. It takes two arguments; the first specifies what central C should be transposed to. The second is the to-be-transposed music. As you can see, in this case, the -transposition has no effect, as central C stay at central C. +transposition has no effect, as central C stays at central C. The purpose of this no-op is circumventing relative mode. Relative mode can not be used together with transposition, so @code{\relative} will leave the contents of @code{\hoomPah} alone. We can use it without having to worry about getting the motive in a wrong octave. +@separate @example bassvoices = \notes \relative c' @{ c4 g8. b,16 @@ -1393,6 +1471,7 @@ Voices can switch between staffs. The easiest way to get this, is to use @code{\autochange}. This command looks at the pitch of each note, and if necessary, will cross to the other staff. For this to work, the two staffs must be called @code{"up"} and @code{"down"}. +@separate @example \translator Staff = down @end example @@ -1402,6 +1481,7 @@ The rest of this melody must be in the lower staff, so we do a manual staff switch here. +@separate @example \context Voice = reallyLow @{\stemDown g2 ~ | g4 c8 @} > @end example @@ -1412,15 +1492,18 @@ that ties and slurs are different things. A tie can only connect two note heads of the same pitch, whereas a slur can connect many chords with one curve. +@separate @example \context PianoStaff @end example A special context is needed to get cross staff beaming right. This context is called @code{PianoStaff}. +@separate @example \context Staff = bottom < \time 2/2; \clef bass; @end example The bottom staff must have a different clef. +@separate @example indent = 0.0; @end example @@ -1490,7 +1573,7 @@ corno = \notes\relative c' @{ Things to note here are the definition of @code{\global} where we define the time signature, and set the end bar. And the separate definition of -@code{\Key} that we will use all staffs except staffs for transposing +@code{\Key} that we will use for all staffs except those for transposing instruments. The second file, @file{os-score.ly} reads the definitions of the first @@ -1593,137 +1676,144 @@ Opus 1. @lilypondfile{os-score.ly} -First, we need to include the music definitions we made in -@file{os-music.ly}. +@separate @example \include "os-music.ly"; @end example +First, we need to include the music definitions we made in +@file{os-music.ly}. -In a large orchestral score like this you're bound to make some small -mistakes, so we enable point and click (See @ref{Point and click}) -editing. +@separate @example #(set! point-and-click line-column-location) @end example +In a large orchestral score like this you're bound to make some small +mistakes, so we enable point and click (See @ref{Point and click}) +editing. -[what is markup text?] - -We need a flat sign in text to name the tuning of the french horn, so we -predefine it with bit of scheme markup text (See @ref{Text markup}). +@separate @example #(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) @end example +[FIXME: what is markup text?] -Of course, all staffs are simultaneous and use the same global settings. +We need a flat sign in text to name the tuning of the french horn, so we +predefine it with bit of scheme markup text (See @ref{Text markup}). + +@separate @example < \global @end example +Of course, all staffs are simultaneous and use the same global settings. -Then, we start a new staff group for the woodwind section (just the -flutes in this case). Immediately after that, we start the staff for -the two flutes, that also play simultaneously. +@separate @example \context StaffGroup = woodwind < \context Staff = flauti < @end example +Then, we start a new staff group for the woodwind section (just the +flutes in this case). Immediately after that, we start the staff for +the two flutes, that also play simultaneously. -We specify the intrument for MIDI output (see @ref{MIDI instrument -names}). +@separate @example \property Staff.midiInstrument = #"flute" @end example +We specify the instrument for MIDI output (see @ref{MIDI instrument +names}). -And define the intrument names to be printed in the margin, -@code{instrument} for the first line of the score, @code{instr} for the -rest of the score. +@separate @example \property Staff.instrument = "2 Flauti" \property Staff.instr = "Fl." @end example +And define the instrument names to be printed in the margin, +@code{instrument} for the first line of the score, @code{instr} for the +rest of the score. -The flutes play in the default key. +@separate @example \Key @end example +The flutes play in the default key. +@separate +@example + \context Voice=one @{ \voiceOne \flautoI @} + \context Voice=two @{ \voiceTwo \flautoII @} +@end example Last come the actual flute parts. Remember that we're still in simultaneous mode. We name both voices differently, so that LilyPond will actually create two Voice contexts. The flute parts are simple, so we specify manually which voice is which: @code{\voiceOne} forces the direction of stems, beams, slurs and ties up, @code{\voiceTwo} sets directions down. -@example - \context Voice=one @{ \voiceOne \flautoI @} - \context Voice=two @{ \voiceTwo \flautoII @} -@end example -We close the flutes staff and woodwind staff group. +@separate @example > > @end example +We close the flutes staff and woodwind staff group. -The timpani staff only shows a new piece of scheme markup, it sets two -lines of text. +@separate @example \property Staff.instrument = #'(lines "Timpani" "(C-G)") @end example +The timpani staff only shows a new piece of scheme markup, it sets two +lines of text. -[what is thread, why is distinction thread/voice necessary?] +@separate +@example + \context Voice=one \partcombine Voice + \context Thread=one \tromboI + \context Thread=two \tromboII +@end example +[FIXME: what is thread, why is distinction thread/voice necessary?] -for the trumpets we use the automatic part combiner (see @ref{Automatic +For the trumpets we use the automatic part combiner (see @ref{Automatic part combining}) to combine the two simultaneous trumpet parts onto the trumpet staff. Each trumpet gets its own Thread context, which must be named @code{one} and @code{two}). The part combiner makes these two threads share a Voice when they're similar, and splits the threads up when they're different. + +@separate @example - \context Voice=one \partcombine Voice - \context Thread=one \tromboI - \context Thread=two \tromboII + \property Staff.instrument = #`(lines "Corno" + (rows "(E" ,text-flat ")")) @end example - The french horn has the most complex scheme markup name, made up of two lines of text. The second line has two elements (rows), the @code{E} and the flat sign @code{text-flat} that we defined before. + +@separate @example - \property Staff.instrument = #`(lines "Corno" - (rows "(E" ,text-flat ")")) + \property Staff.transposing = #3 @end example - The french horn is to be tuned in E-flat, so we tell the MIDI backend to transpose this staff by three steps. -[note how we can choose different tuning for entering, printing and +[FIXME: note how we can choose different tuning for entering, printing and playing, using \transpose and transposing.] -@example - \property Staff.transposing = #3 -@end example - -Therefore, it has a different key. +@separate @example \notes \key bes \major; @end example +Therefore, it has a different key. -We specify a big indent for the first line and a small linewith for this -tuturial. +@separate @example indent = 15 * \staffspace; linewidth = 60 * \staffspace; @end example +We specify a big indent for the first line and a small linewidth for this +tutorial. -[explain about overriding contexts.] - -Because we have a Thread representing one instrument, we need to move -the @code{Rest_engraver} from Voice to Thread level. Similarly, we need -to move the @code{Multi_measure_rest_engraver} from Staff to Voice -level. - -[todo: should put Rest_engraver in threadcontext by default.] - +@separate @example \translator@{ \ThreadContext @@ -1736,11 +1826,16 @@ level. \consists "Bar_engraver"; @} @end example +[FIXME: explain about overriding contexts.] -In orchestral scores, it often happens that one instrument has only -rests during one line of the score. The @code{HaraKiriStaffContext} can -be used as a regular @code{StaffContext} drop-in and will take care of -the automatic removing of empty staffs. +Because we have a Thread representing one instrument, we need to move +the @code{Rest_engraver} from Voice to Thread level. Similarly, we need +to move the @code{Multi_measure_rest_engraver} from Staff to Voice +level. + +[FIXME: should put Rest_engraver in threadcontext by default.] + +@separate @example \translator@{ \HaraKiriStaffContext @@ -1748,9 +1843,10 @@ the automatic removing of empty staffs. \remove "Bar_engraver"; @} @end example - -We want bar numbering at score level and want to move the bar number a -few staff spaces up. +In orchestral scores, it often happens that one instrument has only +rests during one line of the score. The @code{HaraKiriStaffContext} can +be used as a regular @code{StaffContext} drop-in and will take care of +the automatic removing of empty staffs. @ignore [note how you can use \override in \translator] @@ -1767,12 +1863,18 @@ OrchestralScoreContext= \translator { @end ignore +@separate @example \translator @{ \OrchestralScoreContext BarNumber \override #'padding = #3 @} @end example +FIXME: use \property Score.BarNumber + +We want bar numbering at score level and want to move the bar number a +few staff spaces up. + @node Part extraction @section Part extraction @@ -1799,7 +1901,7 @@ second flute part. linewidth = 80 * \staffspace; textheight = 200 * \staffspace; \translator @{ - \OrchestralScoreContext %%%%junkme + \OrchestralScoreContext %%%%FIXME skipBars = ##t @} @} @@ -1827,28 +1929,32 @@ instantiations, we can easily define a second score from the music of the second flute. This then is the part for the second flute player. Of course, we make separate parts for all individual instruments. -In this individual part the second flute has a whole staff for itself, -so we don't want to force stem or tie directions. +@separate @example \flautoII @end example +In this individual part the second flute has a whole staff for itself, +so we don't want to force stem or tie directions. -The @code{\header} definitions were also read from @file{os-music.ly}, -but we need to set the instrument for this particular score. +@separate @example \header @{ instrument = "Flauto II"; @} @end example +The @code{\header} definitions were also read from @file{os-music.ly}, +but we need to set the instrument for this particular score. -In the conductor's full score, all bars with rests are printed, but for -the individual parts, we want to contract pieces of consecutive empty -bars. +@separate @example skipBars = ##t @end example +In the conductor's full score, all bars with rests are printed, but for +the individual parts, we want to contract pieces of consecutive empty +bars. -[Waarom moet skipBars in \translator, waarom niet \property Score.skipBars] +[FIXME: Waarom moet skipBars in \translator, waarom niet \property +Score.skipBars] @@ -1894,10 +2000,10 @@ this might be inserted before your code: @end example The actual values for linewidth will differ depending on papersize and number of columns. Also, if you use a different fontsize for the -music, another file than @code{paper16.ly} will be included. +music, another file than @code{paper16.ly} should be included. If you want to make the music not so wide, you can insert a -@code{\paper} statement that set the linewidth: +@code{\paper} statement to set the linewidth: @lilypond[veryverbatim, intertext="produces this music:"] \score{ @@ -2019,8 +2125,8 @@ The following options set the fontsize: @subsection More options @itemize -@item The @code{singleline} option set @code{linewidth} to -1.0. -@item The @code{multiline} option set @code{linewidth} to a value letting +@item The @code{singleline} option sets @code{linewidth} to -1.0. +@item The @code{multiline} option sets @code{linewidth} to a value letting the music be aligned to the right margin. The music can span several lines. @end itemize @@ -2061,7 +2167,7 @@ To the right you can see some bars from the trumpet fanfara from the beginning of the fantastic street opera ``Houdini the Great'', by the Danish composer Andy Pape. The music is put inside a @code{floatingfigure} environment, and the music will be aligned by -the right marging if you set floatingfigure width and lilypond linewidth +the right margin if you set floatingfigure width and lilypond linewidth to the same value. The code looks like this: @lilypond[verbatim] @@ -2085,7 +2191,7 @@ your document. Then the line spacing will not be increased between the lines where you have music printed with the smallest font size. Lilypond-book does know about @code{\onecolumn} and @code{\twocolumn}. -So the music will be adjusted to the new linewith: +So the music will be adjusted to the new linewidth: Verbatim environments will also ignore the page margins. That is a feature of La@TeX{}. (But you usually put things inside a verbatim @@ -2146,8 +2252,8 @@ just before the music fragment. That's all folks. From here, you can either try fiddling with input files, or you can read the reference manual. You can find more example -files in @file{input} and @file{input/test}. You can also look at Real -Music (TM), have a look at the @ref{Mutopia project}. +files in @file{input} and @file{input/test}. You can also look at some +Real Music (TM), have a look at the @ref{Mutopia project}. @@ -2166,9 +2272,9 @@ this should be on mutopia website. If you have a big music project, or just a lot of LilyPond input files, all generated output from LilyPond, @TeX{} and metafont will clutter your working directory. LilyPond comes with a one-size-fits-all -pre-cooked makefile that helps you manage producing ouptut. It will -produce all output in @file{out}, generate and track dependencies. -Also, it helps in preparing your submission to the @ref{Mutopia +pre-cooked makefile that helps you manage producing output. It will +produce all output in the directory @file{out} , generate and track +dependencies. Also, it helps in preparing your submission to @ref{Mutopia project}. @file{make/ly.make} diff --git a/VERSION b/VERSION index c2c931e21b..49651519b2 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=145 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/clean-fonts.sh b/buildscripts/clean-fonts.sh index 9c132f67b1..e8d457f32e 100755 --- a/buildscripts/clean-fonts.sh +++ b/buildscripts/clean-fonts.sh @@ -4,7 +4,7 @@ # /var/spool/texmf/tfm/lilypond// # ? -VERSION="@TOPLEVEL_VERSION@ +VERSION="@TOPLEVEL_VERSION@" case $# in 0) diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index 436c53d0c1..e7913d0621 100755 --- a/buildscripts/lilypond-login.sh +++ b/buildscripts/lilypond-login.sh @@ -4,27 +4,30 @@ # # Red Hat-like systems should install this in /etc/profile.d/ -setenv GS_FONTPATH "@datadir@/afm:@datadir@/pfa:$GS_FONTPATH" -setenv GS_LIB "@datadir@/ps:$GS_LIB" +# strange shell, this C +set datadir="@datadir@" + +setenv GS_FONTPATH "$datadir/afm:@datadir@/pfa:$GS_FONTPATH" +setenv GS_LIB "$datadir/ps:$GS_LIB" # bit silly. for ly2dvi, overrules compiled-in datadir... # setenv LILYPONDPREFIX "@datadir@" # include an empty path component for the system wide includes. if ($?MFINPUTS) then - setenv MFINPUTS "/usr/share/lilypond/mf:${MFINPUTS}::" + setenv MFINPUTS "$datadir/mf:${MFINPUTS}::" else - setenv MFINPUTS "/usr/share/lilypond/mf::" + setenv MFINPUTS "$datadir/mf::" endif if ($?TEXINPUTS) then - setenv TEXINPUTS "/usr/share/lilypond/tex:${TEXINPUTS}::" + setenv TEXINPUTS "$datadir/tex:${TEXINPUTS}::" else - setenv TEXINPUTS "/usr/share/lilypond/tex::" + setenv TEXINPUTS "$datadir/tex::" endif if ($?TFMFONTS) then - setenv TFMFONTS "@datadir@/tfm:$TFMFONTS" + setenv TFMFONTS "$datadir/tfm:$TFMFONTS" else - setenv TFMFONTS "@datadir@/tfm:" + setenv TFMFONTS "$datadir/tfm:" endif diff --git a/input/tutorial/menuet.ly b/input/tutorial/menuet.ly index 6cef8dee95..a1bb68f7f3 100644 --- a/input/tutorial/menuet.ly +++ b/input/tutorial/menuet.ly @@ -1,5 +1,5 @@ -% lines preceded by a percent are comments. +% lines preceded by a percent sign are comments. \include "paper16.ly" \score { \notes diff --git a/lily/main.cc b/lily/main.cc index 0c6ee806b0..d0a4492d0e 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -101,20 +101,24 @@ static Getopt_long *oparser_p_static = 0; follow regular localisation guidelines). */ static Long_option_init options_static[] = { - {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, + /* another bug in option parser: --output=foe is taken as an abbreviation + for --output-format */ + // {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, + + {_i ("EXT"), "format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, {0, "help", 'h', _i ("this help")}, {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, {0, "dependencies", 'M', _i ("write Makefile dependencies for every input file")}, {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, + {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")}, {0, "no-paper", 'm', _i ("produce MIDI output only")}, - {_i ("NAME"), "output", 'o', _i ("write output to NAME")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, {0, "safe", 's', _i ("inhibit file output naming and exporting")}, {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i ("verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")}, {0,0,0,0} }; diff --git a/make/ly.make b/make/ly.make index 8355a3dc65..3e8824f810 100644 --- a/make/ly.make +++ b/make/ly.make @@ -62,7 +62,8 @@ mutopia-examples=$(name) $(parts) # $(outdir)/%-book.ps: $(outdir)/%.ps psbook $< $<.tmp - pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.tmp $@ +# pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.tmp $@ + pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@ # # Catch-all target: type `make foo' to make out/foo.ps, diff --git a/po/de.po b/po/de.po index 6c5bc7513e..ba9075da20 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -13,147 +13,287 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 +#: ly2dvi.py:88 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 +msgid "warning: " +msgstr "Warnung: " + +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "Fehler: " + +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 +#, fuzzy +msgid "Exiting ... " +msgstr "Linie ... " + +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" + +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 +msgid "Options:" +msgstr "Optionen:" + +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 +#, fuzzy, c-format +msgid "Report bugs to %s" +msgstr "Melde Fehler an" + +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 +#, fuzzy, c-format +msgid "Invoking `%s'" +msgstr "Uralt-Bitte: `%s'" + +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:272 update-lily.py:218 +#, fuzzy, c-format +msgid "Cleaning %s..." +msgstr "Uralt-Bitte: `%s'" + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "Kein solches instrument: `%s'" + +#: ly2dvi.py:298 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 msgid "this help" msgstr "Diese Hilfe" -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" +msgstr "DIR" + +#: ly2dvi.py:300 +#, fuzzy +msgid "add DIR to LilyPond's search path" +msgstr "Hänge DIR an den Suchpfad an" + +#: ly2dvi.py:301 +#, c-format +msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:88 +#: ly2dvi.py:302 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:303 main.cc:116 +#, fuzzy +msgid "produce MIDI output only" +msgstr "Nur Midiausgabe" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "DATEI" + +#: ly2dvi.py:304 +#, fuzzy +msgid "write ouput to FILE" +msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" + +#: ly2dvi.py:306 #, fuzzy msgid "generate PostScript output" msgstr "Degenerierte Zwangsbedingungen" -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" +#: ly2dvi.py:307 +msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:90 -msgid "don't run LilyPond" +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:91 main.cc:115 +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: ly2dvi.py:92 main.cc:104 main.cc:114 +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: ly2dvi.py:93 main.cc:106 main.cc:116 +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:94 -msgid "dump all final output into DIR" -msgstr "" +#: ly2dvi.py:336 +#, fuzzy, c-format +msgid "Analyzing %s..." +msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:95 main.cc:109 -msgid "write Makefile dependencies for every input file" -msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" +#: ly2dvi.py:381 +#, c-format +msgid "no lilypond output found for %s" +msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 -msgid "warning: " -msgstr "Warnung: " +#: ly2dvi.py:423 +#, fuzzy, c-format +msgid "invalid value: %s" +msgstr "Ungültiger Buchstabe `%c'" -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "Fehler: " +#: ly2dvi.py:497 ly2dvi.py:514 +#, fuzzy, c-format +msgid "Running %s..." +msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:130 -#, fuzzy -msgid "Exiting ... " -msgstr "Linie ... " +#: ly2dvi.py:654 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Ausgabe auf Papier auf %s..." -#: ly2dvi.py:149 +#: ly2dvi.py:665 #, fuzzy, c-format -msgid "Reading %s..." -msgstr "Uralt-Bitte: `%s'" +msgid "%s output to %s..." +msgstr "MIDI-Ausgabe nach %s..." -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format -msgid "can't open file: `%s'" -msgstr "Kann die Datei %s nicht öffnen" +msgid "can't find file: `%s'" +msgstr "Kann Datei `%s' nicht finden" -#: ly2dvi.py:216 +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "" + +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" + +#: mup2ly.py:960 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE" -msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" +msgid "no such context: %s" +msgstr "Kein solches instrument: `%s'" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" +#: mup2ly.py:1109 +msgid "debug" msgstr "" -#: ly2dvi.py:220 main.cc:119 main.cc:146 -msgid "Options:" -msgstr "Optionen:" +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" + +#: main.cc:117 mup2ly.py:1112 +#, fuzzy +msgid "write output to FILE" +msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" +#: mup2ly.py:1113 +msgid "only pre-process" msgstr "" -#: ly2dvi.py:226 main.cc:123 main.cc:169 +#: mup2ly.py:1190 #, fuzzy, c-format -msgid "Report bugs to %s" -msgstr "Melde Fehler an" +msgid "Processing %s..." +msgstr "Verarbeite..." -#: ly2dvi.py:260 +#: mup2ly.py:1203 #, fuzzy, c-format -msgid "Invoking `%s'" -msgstr "Uralt-Bitte: `%s'" +msgid "Writing %s..." +msgstr "Linie ... " + +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" +msgstr "" -#: ly2dvi.py:263 +#: update-lily.py:238 #, c-format -msgid "command exited with value %d" +msgid "unpack and build in DIR [%s]" msgstr "" -#: ly2dvi.py:265 -msgid "(ignored)" +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" msgstr "" -#: ly2dvi.py:301 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "Kein solches instrument: `%s'" +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" -#: ly2dvi.py:309 +#: update-lily.py:241 #, c-format -msgid "Analyzing `%s'" +msgid "%n: package name" msgstr "" -#: ly2dvi.py:353 +#: update-lily.py:242 +#, fuzzy +msgid "%r: release directory" +msgstr "Kann ein `%s' weder finden noch erzeugen" + +#: update-lily.py:243 +msgid "%t: tarball" +msgstr "" + +#: update-lily.py:244 +msgid "%v: package version" +msgstr "" + +#: update-lily.py:247 #, c-format -msgid "no lilypond output found for %s" +msgid "keep all output, and name the directory %s" +msgstr "" + +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" +msgstr "" + +#: update-lily.py:249 +msgid "remove previous build" +msgstr "" + +#: update-lily.py:252 +#, c-format +msgid "fetch and build URL [%s]" msgstr "" -#: ly2dvi.py:395 +#: update-lily.py:358 #, fuzzy, c-format -msgid "invalid value: %s" -msgstr "Ungültiger Buchstabe `%c'" +msgid "listing %s..." +msgstr "Linie ... " -#: ly2dvi.py:602 scores.cc:44 +#: update-lily.py:418 +#, c-format +msgid "latest is %s" +msgstr "" + +#: update-lily.py:419 +#, c-format +msgid "relax, %s is up to date" +msgstr "" + +#: update-lily.py:427 update-lily.py:439 #, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "Ausgabe auf Papier auf %s..." +msgid "fetching %s..." +msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:603 +#: update-lily.py:448 #, fuzzy, c-format -msgid "%s output to %s..." -msgstr "MIDI-Ausgabe nach %s..." +msgid "building %s..." +msgstr "Uralt-Bitte: `%s'" #: data-file.cc:54 msgid "EOF in a string" msgstr "Dateiende in Zeichenkette" -#: dstream.cc:186 -#, fuzzy -msgid "not enough fields in Dstream init" -msgstr "Nicht genug Felder in der Dstream Inititalisierung" - #: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" @@ -187,6 +327,12 @@ msgstr "Position unbekannt" msgid "can't map file" msgstr "Kann die Datei nicht mappen" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "Kann die Datei %s nicht öffnen" + #: simple-file-storage.cc:56 #, fuzzy, c-format msgid "Huh? Got %d, expected %d characters" @@ -221,43 +367,43 @@ msgstr "Ich kann das Zeichen `%s' nicht finden" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, c-format msgid "can't find font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 #, fuzzy msgid "Loading default font" msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift." -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(Suchpfad: `%s')" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "" @@ -337,7 +483,7 @@ msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 #, fuzzy msgid "unterminated chord tremolo" msgstr "Unbeendeter Bindestrich" @@ -351,36 +497,26 @@ msgstr "Keiner darf eine Wiederholungsklammer drucken" msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." -#: debug.cc:26 -#, fuzzy -msgid "floating point exception" -msgstr "Ausnahmefehler in einer Fließpunktberechnung" - -#: debug.cc:50 -#, fuzzy -msgid "can't set mem-checking!" -msgstr "Kann die Speicherüberprüfung nicht setzen" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "Ich kann kein (De)crescendo bis zum Ende finden" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" @@ -417,11 +553,11 @@ msgstr "" "Unverknüpfte Verzierungsnoten. Ich verknüpfe sie mit der letzten " "musikalischen Spalte." -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:72 +#: hairpin.cc:94 #, fuzzy msgid "crescendo too small" msgstr "Crescendo" @@ -434,13 +570,15 @@ msgstr "Unbeendeter Bindestrich" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, c-format -msgid "can't find file: `%s'" -msgstr "Kann Datei `%s' nicht finden" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." +msgstr "" + +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "" -#: key-engraver.cc:103 key-performer.cc:77 +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -463,93 +601,73 @@ msgstr "" msgid "Calculating column positions..." msgstr "Berechne Position der Spalten..." -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:104 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:106 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "DIR" - -#: main.cc:107 +#: main.cc:111 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "DATEI" - -#: main.cc:108 +#: main.cc:112 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:111 -#, fuzzy -msgid "produce MIDI output only" -msgstr "Nur Midiausgabe" - -#: main.cc:112 -#, fuzzy -msgid "NAME" -msgstr "BASENAME" - -#: main.cc:112 -#, fuzzy -msgid "write output to NAME" -msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" - -#: main.cc:113 -msgid "inhibit file output naming and exporting" -msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" - -#: main.cc:117 +#: main.cc:115 msgid "EXPR" msgstr "" -#: main.cc:117 +#: main.cc:115 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" +#: main.cc:118 +msgid "inhibit file output naming and exporting" +msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:136 +#: main.cc:140 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:140 +#: main.cc:144 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" @@ -559,11 +677,11 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:150 +#: main.cc:154 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -576,17 +694,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:194 +#: main.cc:198 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -616,16 +734,16 @@ msgstr "" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" "USA.\n" -#: midi-item.cc:312 +#: midi-item.cc:138 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Kein solches instrument: `%s'" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "Unsinnige Dauer" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "unsinnige Tonhöhe" @@ -634,23 +752,23 @@ msgstr "unsinnige Tonh msgid "Transposition by %s makes accidental larger than two" msgstr "Transponieren um %s macht Vorzecihen größer als zwei" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "" @@ -688,7 +806,7 @@ msgstr "Uralt-Bitte: `%s'" msgid "paper output to %s..." msgstr "Ausgabe auf Papier auf %s..." -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr ", bei " @@ -732,9 +850,9 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:108 +#: percent-repeat-engraver.cc:118 #, fuzzy -msgid "Don't know yet how to handle this percent repeat." +msgid "Don't know how to handle a percent repeat of this length." msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll" #: percent-repeat-iterator.cc:53 @@ -746,16 +864,16 @@ msgstr "Keiner darf eine Wiederholungsklammer drucken" msgid "Track ... " msgstr "Stück ... " -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "Erstellt von: " -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." @@ -792,12 +910,12 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Falsche Type für Besitz-Wert" -#: rest-collision.cc:190 +#: rest-collision.cc:194 #, fuzzy msgid "too many colliding rests" msgstr "Zu viele kollidierende Pausen." -#: rest-collision.cc:194 +#: rest-collision.cc:198 #, fuzzy msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." @@ -822,7 +940,7 @@ msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "Unbeschränkter Abstand `%s'" @@ -915,11 +1033,11 @@ msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "Es wurden keine Haltebögen erzeugt!" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "Einsamer Haltebogen" @@ -1016,100 +1134,100 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1382 +#: parser.yy:1379 #, fuzzy msgid "Must have duration object" msgstr "Setze kürzeste Dauer (?)" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1602 +#: parser.yy:1606 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" -#: parser.yy:1698 +#: parser.yy:1702 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:204 +#: lexer.ll:205 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "Unbekannter Identifier: `%s'" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 #, fuzzy msgid "Missing end quote" msgstr "Endnote fehlt" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "Erwarte Weiß" -#: lexer.ll:244 +#: lexer.ll:245 #, fuzzy msgid "Can't evaluate Scheme in safe mode" msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:440 +#: lexer.ll:434 #, c-format msgid "invalid character: `%c'" msgstr "Ungültiger Buchstabe `%c'" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "Unbekannte Sonder-Zeichenkette" -#: lexer.ll:603 +#: lexer.ll:597 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "Falsche Version von Lilypond: %s (%s, %s)" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1333,6 +1451,30 @@ msgstr "Erwarte MIDI-St msgid "invalid track length" msgstr "Unzulässige Länge für ein Stück" +#, fuzzy +#~ msgid "NAME" +#~ msgstr "BASENAME" + +#, fuzzy +#~ msgid "write output to NAME" +#~ msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" + +#, fuzzy +#~ msgid "write ouput to NAME" +#~ msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" + +#, fuzzy +#~ msgid "not enough fields in Dstream init" +#~ msgstr "Nicht genug Felder in der Dstream Inititalisierung" + +#, fuzzy +#~ msgid "floating point exception" +#~ msgstr "Ausnahmefehler in einer Fließpunktberechnung" + +#, fuzzy +#~ msgid "can't set mem-checking!" +#~ msgstr "Kann die Speicherüberprüfung nicht setzen" + #, fuzzy #~ msgid "Dependency file left in `%s'" #~ msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." diff --git a/po/fr.po b/po/fr.po index 71bc705d07..921e1a200c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,152 +6,290 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 +#: ly2dvi.py:88 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 +msgid "warning: " +msgstr "avertissement: " + +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "erreur: " + +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 +#, fuzzy +msgid "Exiting ... " +msgstr "Ligne ..." + +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Usage: %s [OPTION... [FICHIER]" + +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 +msgid "Options:" +msgstr "Options: " + +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 +#, fuzzy, c-format +msgid "Report bugs to %s" +msgstr "Rapporter les bugs à" + +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 +#, c-format +msgid "Invoking `%s'" +msgstr "" + +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:272 update-lily.py:218 +#, fuzzy, c-format +msgid "Cleaning %s..." +msgstr "Création des voix..." + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "Pas d'instrument tel: `%s'" + +#: ly2dvi.py:298 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 msgid "this help" msgstr "cette aide" -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" +msgstr "REP" + +#: ly2dvi.py:300 +#, fuzzy +msgid "add DIR to LilyPond's search path" +msgstr "ajoute REP au chemin de recherche" + +#: ly2dvi.py:301 +#, c-format +msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:88 +#: ly2dvi.py:302 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:303 main.cc:116 +#, fuzzy +msgid "produce MIDI output only" +msgstr "produit seulement la sortie MIDI" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "FICHIER" + +#: ly2dvi.py:304 +msgid "write ouput to FILE" +msgstr "" + +#: ly2dvi.py:306 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" +#: ly2dvi.py:307 +msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:90 -msgid "don't run LilyPond" +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:91 main.cc:115 +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 msgid "verbose" msgstr "" -#: ly2dvi.py:92 main.cc:104 main.cc:114 +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 msgid "print version number" msgstr "afficher le numéro de version" -#: ly2dvi.py:93 main.cc:106 main.cc:116 +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:94 -msgid "dump all final output into DIR" -msgstr "" +#: ly2dvi.py:336 +#, fuzzy, c-format +msgid "Analyzing %s..." +msgstr "Création des voix..." -#: ly2dvi.py:95 main.cc:109 -msgid "write Makefile dependencies for every input file" +#: ly2dvi.py:381 +#, c-format +msgid "no lilypond output found for %s" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 -msgid "warning: " -msgstr "avertissement: " +#: ly2dvi.py:423 +#, fuzzy, c-format +msgid "invalid value: %s" +msgstr "caractères illégal: `%c'" -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "erreur: " +#: ly2dvi.py:497 ly2dvi.py:514 +#, fuzzy, c-format +msgid "Running %s..." +msgstr "Création des voix..." -#: ly2dvi.py:130 -#, fuzzy -msgid "Exiting ... " -msgstr "Ligne ..." +#: ly2dvi.py:654 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Sortie papier vers %s..." -#: ly2dvi.py:149 +#: ly2dvi.py:665 #, fuzzy, c-format -msgid "Reading %s..." -msgstr "Création des voix..." +msgid "%s output to %s..." +msgstr "Sortie de Lily vers %s..." -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format -msgid "can't open file: `%s'" -msgstr "impossible d'ouvrir le fichier: `%s'" +msgid "can't find file: `%s'" +msgstr "ne peut pas trouver le fichier: `%s'" + +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "" + +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" -#: ly2dvi.py:216 +#: mup2ly.py:960 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE" -msgstr "Usage: %s [OPTION... [FICHIER]" +msgid "no such context: %s" +msgstr "Pas d'instrument tel: `%s'" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" +#: mup2ly.py:1109 +msgid "debug" msgstr "" -#: ly2dvi.py:220 main.cc:119 main.cc:146 -msgid "Options:" -msgstr "Options: " +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" + +#: main.cc:117 mup2ly.py:1112 +msgid "write output to FILE" +msgstr "" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" +#: mup2ly.py:1113 +msgid "only pre-process" msgstr "" -#: ly2dvi.py:226 main.cc:123 main.cc:169 +#: mup2ly.py:1190 #, fuzzy, c-format -msgid "Report bugs to %s" -msgstr "Rapporter les bugs à" +msgid "Processing %s..." +msgstr "Traitement..." + +#: mup2ly.py:1203 +#, fuzzy, c-format +msgid "Writing %s..." +msgstr "Ligne ..." + +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" +msgstr "" -#: ly2dvi.py:260 +#: update-lily.py:238 #, c-format -msgid "Invoking `%s'" +msgid "unpack and build in DIR [%s]" +msgstr "" + +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" msgstr "" -#: ly2dvi.py:263 +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" + +#: update-lily.py:241 #, c-format -msgid "command exited with value %d" +msgid "%n: package name" msgstr "" -#: ly2dvi.py:265 -msgid "(ignored)" +#: update-lily.py:242 +#, fuzzy +msgid "%r: release directory" +msgstr "ne peut pas trouver ou créer `%s'" + +#: update-lily.py:243 +msgid "%t: tarball" msgstr "" -#: ly2dvi.py:301 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "Pas d'instrument tel: `%s'" +#: update-lily.py:244 +msgid "%v: package version" +msgstr "" -#: ly2dvi.py:309 +#: update-lily.py:247 #, c-format -msgid "Analyzing `%s'" +msgid "keep all output, and name the directory %s" +msgstr "" + +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" +msgstr "" + +#: update-lily.py:249 +msgid "remove previous build" msgstr "" -#: ly2dvi.py:353 +#: update-lily.py:252 #, c-format -msgid "no lilypond output found for %s" +msgid "fetch and build URL [%s]" msgstr "" -#: ly2dvi.py:395 +#: update-lily.py:358 #, fuzzy, c-format -msgid "invalid value: %s" -msgstr "caractères illégal: `%c'" +msgid "listing %s..." +msgstr "Ligne ..." -#: ly2dvi.py:602 scores.cc:44 +#: update-lily.py:418 +#, c-format +msgid "latest is %s" +msgstr "" + +#: update-lily.py:419 +#, c-format +msgid "relax, %s is up to date" +msgstr "" + +#: update-lily.py:427 update-lily.py:439 #, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "Sortie papier vers %s..." +msgid "fetching %s..." +msgstr "Création des voix..." -#: ly2dvi.py:603 +#: update-lily.py:448 #, fuzzy, c-format -msgid "%s output to %s..." -msgstr "Sortie de Lily vers %s..." +msgid "building %s..." +msgstr "Création des voix..." #: data-file.cc:54 #, fuzzy msgid "EOF in a string" msgstr "EOF dans une chaîne" -#: dstream.cc:186 -#, fuzzy -msgid "not enough fields in Dstream init" -msgstr "Pas assez de champs dans l'initialisation de Dstream." - #: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" @@ -185,6 +323,12 @@ msgstr "position inconnue" msgid "can't map file" msgstr "impossible de mapper le fichier" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "impossible d'ouvrir le fichier: `%s'" + #: simple-file-storage.cc:56 #, fuzzy, c-format msgid "Huh? Got %d, expected %d characters" @@ -219,43 +363,43 @@ msgstr "impossible de trouver le caract msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 #, fuzzy msgid "Loading default font" msgstr "Impossible de trouver la police `%s', chargement la police par défaut" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, 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:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "chemin de recherche= %s" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "" @@ -335,7 +479,7 @@ msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 msgid "unterminated chord tremolo" msgstr "" @@ -348,36 +492,26 @@ msgstr "" msgid "Too many clashing notecolumns. Ignoring them." msgstr "Trop de colonnes de notes superposées. Je les ignore." -#: debug.cc:26 -#, fuzzy -msgid "floating point exception" -msgstr "Exceptions de virgule flottante" - -#: debug.cc:50 -#, fuzzy -msgid "can't set mem-checking!" -msgstr "impossible de positionner mem-checking" - #: dimensions.cc:13 msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ne peut pas trouver un (de)crescendo à la fin" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 #, fuzzy msgid "already have a crescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminé" @@ -411,11 +545,11 @@ msgstr "pas une vrai variable" msgid "Unattached grace notes. Attaching to last musical column." msgstr "" -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:72 +#: hairpin.cc:94 #, fuzzy msgid "crescendo too small" msgstr "trop petit" @@ -428,13 +562,15 @@ msgstr "" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, c-format -msgid "can't find file: `%s'" -msgstr "ne peut pas trouver le fichier: `%s'" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." +msgstr "" + +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "" -#: key-engraver.cc:103 key-performer.cc:77 +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -457,91 +593,73 @@ msgstr "" msgid "Calculating column positions..." msgstr "Calcul de la position des colonnes..." -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:104 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:106 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "REP" - -#: main.cc:107 +#: main.cc:111 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "FICHIER" - -#: main.cc:108 +#: main.cc:112 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:111 -#, fuzzy -msgid "produce MIDI output only" -msgstr "produit seulement la sortie MIDI" - -#: main.cc:112 -msgid "NAME" +#: main.cc:115 +msgid "EXPR" msgstr "" -#: main.cc:112 -msgid "write output to NAME" +#: main.cc:115 +msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" -#: main.cc:113 +#: main.cc:118 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:117 -msgid "EXPR" -msgstr "" - -#: main.cc:117 -msgid "evalute EXPR as Scheme after .scm init is read" -msgstr "" - #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:136 +#: main.cc:140 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:140 +#: main.cc:144 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -552,12 +670,12 @@ msgstr "" "paritions à partir de description de gaut niveau en entrée. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:150 +#: main.cc:154 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet exécutable a été compilé avec les options suivantes:" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -565,17 +683,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:194 +#: main.cc:198 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -592,16 +710,16 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:312 +#: midi-item.cc:138 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Pas d'instrument tel: `%s'" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "" @@ -610,23 +728,23 @@ msgstr "" msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "" @@ -663,7 +781,7 @@ msgstr "" msgid "paper output to %s..." msgstr "Sortie papier vers %s..." -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr ", à " @@ -706,9 +824,9 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:108 +#: percent-repeat-engraver.cc:118 #, fuzzy -msgid "Don't know yet how to handle this percent repeat." +msgid "Don't know how to handle a percent repeat of this length." msgstr "ne sait pas traiter les clés vides" #: percent-repeat-iterator.cc:53 @@ -720,16 +838,16 @@ msgstr "" msgid "Track ... " msgstr "Piste ... " -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "Auteur: " -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "" @@ -766,11 +884,11 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Mauvais type pour la valeur de la propriété" -#: rest-collision.cc:190 +#: rest-collision.cc:194 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:194 +#: rest-collision.cc:198 msgid "too many notes for rest collision" msgstr "" @@ -792,7 +910,7 @@ msgstr "" msgid "elapsed time: %.2f seconds" msgstr "temps ecoulé: %.2f secondes" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "traducteur inconnu `%s'" @@ -881,11 +999,11 @@ msgstr "" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "Aucune liaison n'a été crée" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "liaison solitaire" @@ -981,98 +1099,98 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1382 +#: parser.yy:1379 #, fuzzy msgid "Must have duration object" msgstr "Positionne la plus petite durée (?)" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "il fayt être en mode Parole pour les paroles" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "pas une durée: %d" -#: parser.yy:1602 +#: parser.yy:1606 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "il faut être en mode Note pour les notes" -#: parser.yy:1698 +#: parser.yy:1702 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "il faut être en mode Accord pour les accords" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "EOF trouvé dans un commentaire" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:204 +#: lexer.ll:205 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentifiant non défini: `%s'" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "blanche attendue" -#: lexer.ll:244 +#: lexer.ll:245 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:440 +#: lexer.ll:434 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "caractères illégal: `%c'" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" -#: lexer.ll:603 +#: lexer.ll:597 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "version de mudela incorrecte: %s (%s, %s)" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1293,6 +1411,18 @@ msgstr "piste MIDI attendue" msgid "invalid track length" msgstr "taille de piste invalide" +#, fuzzy +#~ msgid "not enough fields in Dstream init" +#~ msgstr "Pas assez de champs dans l'initialisation de Dstream." + +#, fuzzy +#~ msgid "floating point exception" +#~ msgstr "Exceptions de virgule flottante" + +#, fuzzy +#~ msgid "can't set mem-checking!" +#~ msgstr "impossible de positionner mem-checking" + #, fuzzy #~ msgid "Dependency file left in `%s'" #~ msgstr "impossible d'ouvrir le fichier: `%s'" diff --git a/po/it.po b/po/it.po index 3177c6e791..6b158b271d 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -13,149 +13,287 @@ msgstr "" "--output-dir=../po/out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 +#: ly2dvi.py:88 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 +msgid "warning: " +msgstr "attenzione: " + +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "errore: " + +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 +msgid "Exiting ... " +msgstr "" + +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "Uso: %s [OPZIONE... [FILE]" + +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 +msgid "Options:" +msgstr "Opzioni: " + +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 +#, c-format +msgid "Report bugs to %s" +msgstr "" + +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 +#, c-format +msgid "Invoking `%s'" +msgstr "" + +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:272 update-lily.py:218 +#, fuzzy, c-format +msgid "Cleaning %s..." +msgstr "Genero le voci..." + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "% strumento:" + +#: ly2dvi.py:298 main.cc:113 +#, fuzzy +msgid "write Makefile dependencies for every input file" +msgstr "" +" -d, --dependencies scrive le dependenze del Makefile per ogni file di " +"input\n" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 msgid "this help" msgstr "" -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" msgstr "" -#: ly2dvi.py:88 +#: ly2dvi.py:300 +#, fuzzy +msgid "add DIR to LilyPond's search path" +msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" + +#: ly2dvi.py:301 +#, c-format +msgid "keep all output, and name the directory %s.dir" +msgstr "" + +#: ly2dvi.py:302 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:303 main.cc:116 +#, fuzzy +msgid "produce MIDI output only" +msgstr " -M, --no-paper produce solo output midi\n" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "" + +#: ly2dvi.py:304 +msgid "write ouput to FILE" +msgstr "" + +#: ly2dvi.py:306 #, fuzzy msgid "generate PostScript output" msgstr "vincoli degenerati" -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" +#: ly2dvi.py:307 +msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:90 -msgid "don't run LilyPond" +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:91 main.cc:115 +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 msgid "verbose" msgstr "" -#: ly2dvi.py:92 main.cc:104 main.cc:114 +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 msgid "print version number" msgstr "" -#: ly2dvi.py:93 main.cc:106 main.cc:116 +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:94 -msgid "dump all final output into DIR" -msgstr "" +#: ly2dvi.py:336 +#, fuzzy, c-format +msgid "Analyzing %s..." +msgstr "Genero le voci..." -#: ly2dvi.py:95 main.cc:109 -#, fuzzy -msgid "write Makefile dependencies for every input file" +#: ly2dvi.py:381 +#, c-format +msgid "no lilypond output found for %s" msgstr "" -" -d, --dependencies scrive le dependenze del Makefile per ogni file di " -"input\n" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 -msgid "warning: " -msgstr "attenzione: " +#: ly2dvi.py:423 +#, fuzzy, c-format +msgid "invalid value: %s" +msgstr "carattere illegale: `%c'" -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "errore: " +#: ly2dvi.py:497 ly2dvi.py:514 +#, fuzzy, c-format +msgid "Running %s..." +msgstr "Genero le voci..." -#: ly2dvi.py:130 -msgid "Exiting ... " -msgstr "" +#: ly2dvi.py:654 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "L'output stampato è inviato a %s..." -#: ly2dvi.py:149 +#: ly2dvi.py:665 #, fuzzy, c-format -msgid "Reading %s..." -msgstr "Genero le voci..." +msgid "%s output to %s..." +msgstr "L'output MIDI è inviato a %s..." -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format -msgid "can't open file: `%s'" -msgstr "non posso aprire il file: `%s'" +msgid "can't find file: `%s'" +msgstr "non trovo il file: `%s'" + +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "" -#: ly2dvi.py:216 +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" + +#: mup2ly.py:960 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE" -msgstr "Uso: %s [OPZIONE... [FILE]" +msgid "no such context: %s" +msgstr "% strumento:" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" +#: mup2ly.py:1109 +msgid "debug" msgstr "" -#: ly2dvi.py:220 main.cc:119 main.cc:146 -msgid "Options:" -msgstr "Opzioni: " +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" +#: main.cc:117 mup2ly.py:1112 +msgid "write output to FILE" msgstr "" -#: ly2dvi.py:226 main.cc:123 main.cc:169 -#, c-format -msgid "Report bugs to %s" +#: mup2ly.py:1113 +msgid "only pre-process" +msgstr "" + +#: mup2ly.py:1190 +#, fuzzy, c-format +msgid "Processing %s..." +msgstr "Elaboro..." + +#: mup2ly.py:1203 +#, fuzzy, c-format +msgid "Writing %s..." +msgstr "Genero le voci..." + +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" msgstr "" -#: ly2dvi.py:260 +#: update-lily.py:238 #, c-format -msgid "Invoking `%s'" +msgid "unpack and build in DIR [%s]" msgstr "" -#: ly2dvi.py:263 +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" +msgstr "" + +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" + +#: update-lily.py:241 #, c-format -msgid "command exited with value %d" +msgid "%n: package name" msgstr "" -#: ly2dvi.py:265 -msgid "(ignored)" +#: update-lily.py:242 +#, fuzzy +msgid "%r: release directory" +msgstr "non trovo e non posso creare `%s'" + +#: update-lily.py:243 +msgid "%t: tarball" msgstr "" -#: ly2dvi.py:301 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "% strumento:" +#: update-lily.py:244 +msgid "%v: package version" +msgstr "" -#: ly2dvi.py:309 +#: update-lily.py:247 #, c-format -msgid "Analyzing `%s'" +msgid "keep all output, and name the directory %s" msgstr "" -#: ly2dvi.py:353 +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" +msgstr "" + +#: update-lily.py:249 +msgid "remove previous build" +msgstr "" + +#: update-lily.py:252 #, c-format -msgid "no lilypond output found for %s" +msgid "fetch and build URL [%s]" msgstr "" -#: ly2dvi.py:395 +#: update-lily.py:358 #, fuzzy, c-format -msgid "invalid value: %s" -msgstr "carattere illegale: `%c'" +msgid "listing %s..." +msgstr "Genero le voci..." + +#: update-lily.py:418 +#, c-format +msgid "latest is %s" +msgstr "" + +#: update-lily.py:419 +#, c-format +msgid "relax, %s is up to date" +msgstr "" -#: ly2dvi.py:602 scores.cc:44 +#: update-lily.py:427 update-lily.py:439 #, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "L'output stampato è inviato a %s..." +msgid "fetching %s..." +msgstr "Genero le voci..." -#: ly2dvi.py:603 +#: update-lily.py:448 #, fuzzy, c-format -msgid "%s output to %s..." -msgstr "L'output MIDI è inviato a %s..." +msgid "building %s..." +msgstr "Genero le voci..." #: data-file.cc:54 msgid "EOF in a string" msgstr "EOF in una corda" -#: dstream.cc:186 -#, fuzzy -msgid "not enough fields in Dstream init" -msgstr "Non ci sono sufficienti campi in Dstream init." - #: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" @@ -189,6 +327,12 @@ msgstr "posizione sconosciuta" msgid "can't map file" msgstr "non posso mappare il documento" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "non posso aprire il file: `%s'" + #: simple-file-storage.cc:56 #, fuzzy, c-format msgid "Huh? Got %d, expected %d characters" @@ -221,42 +365,42 @@ msgstr "non riesco a trovare il carattere `%s'" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 msgid "Loading default font" msgstr "" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "(Il path di caricamento è `%s'" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "" @@ -335,7 +479,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 #, fuzzy msgid "unterminated chord tremolo" msgstr "beam non terminato" @@ -349,36 +493,26 @@ msgstr "" msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." -#: debug.cc:26 -#, fuzzy -msgid "floating point exception" -msgstr "Eccezione di virgola mobile" - -#: debug.cc:50 -#, fuzzy -msgid "can't set mem-checking!" -msgstr "non posso settare mem-checking" - #: dimensions.cc:13 msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "non trovo un (de)crescendo fino alla fine" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" @@ -412,11 +546,11 @@ msgstr "non msgid "Unattached grace notes. Attaching to last musical column." msgstr "" -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:72 +#: hairpin.cc:94 #, fuzzy msgid "crescendo too small" msgstr "troppo piccolo" @@ -430,13 +564,15 @@ msgstr "beam non terminato" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, c-format -msgid "can't find file: `%s'" -msgstr "non trovo il file: `%s'" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." +msgstr "" + +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "" -#: key-engraver.cc:103 key-performer.cc:77 +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -459,106 +595,88 @@ msgstr "" msgid "Calculating column positions..." msgstr "Calcolo delle posizioni della colonne..." -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:104 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:106 +#: main.cc:110 msgid "FIELD" msgstr "" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "" - -#: main.cc:107 +#: main.cc:111 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "" - -#: main.cc:108 +#: main.cc:112 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:111 -#, fuzzy -msgid "produce MIDI output only" -msgstr " -M, --no-paper produce solo output midi\n" - -#: main.cc:112 -msgid "NAME" +#: main.cc:115 +msgid "EXPR" msgstr "" -#: main.cc:112 -msgid "write output to NAME" +#: main.cc:115 +msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" -#: main.cc:113 +#: main.cc:118 #, 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:117 -msgid "EXPR" -msgstr "" - -#: main.cc:117 -msgid "evalute EXPR as Scheme after .scm init is read" -msgstr "" - #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:136 +#: main.cc:140 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:140 +#: main.cc:144 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:150 +#: main.cc:154 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -566,17 +684,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:194 +#: main.cc:198 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -608,16 +726,16 @@ msgstr "" "Cambridge, MA 02136\n" "USA.\n" -#: midi-item.cc:312 +#: midi-item.cc:138 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "% strumento:" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "indicazione durata priva di senso" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "indicazione altezza priva di senso" @@ -626,23 +744,23 @@ msgstr "indicazione altezza priva di senso" msgid "Transposition by %s makes accidental larger than two" msgstr "la trasposizine di %s rende le alterazioni più che doppie" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "" @@ -680,7 +798,7 @@ msgstr "Cosa? Non msgid "paper output to %s..." msgstr "L'output stampato è inviato a %s..." -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr ", a " @@ -724,9 +842,9 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:108 +#: percent-repeat-engraver.cc:118 #, fuzzy -msgid "Don't know yet how to handle this percent repeat." +msgid "Don't know how to handle a percent repeat of this length." msgstr "non so manipolare tasti vuoti" #: percent-repeat-iterator.cc:53 @@ -738,16 +856,16 @@ msgstr "" msgid "Track ... " msgstr "traccia " -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "Autore: " -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "della definizione musicale: %s" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." @@ -784,12 +902,12 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Tipo sbagliato per il valore di una proprietà" -#: rest-collision.cc:190 +#: rest-collision.cc:194 #, fuzzy msgid "too many colliding rests" msgstr "Troppi crescendi" -#: rest-collision.cc:194 +#: rest-collision.cc:198 msgid "too many notes for rest collision" msgstr "" @@ -813,7 +931,7 @@ msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, fuzzy, c-format msgid "unbound spanner `%s'" msgstr "Spanner non legato `%s'" @@ -905,11 +1023,11 @@ msgstr "" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "" @@ -1005,99 +1123,99 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1382 +#: parser.yy:1379 #, fuzzy msgid "Must have duration object" msgstr "indicazione durata priva di senso" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1602 +#: parser.yy:1606 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1698 +#: parser.yy:1702 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "ho trovato un EOF in un commento" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:204 +#: lexer.ll:205 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentificatore non definito: `%s'" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 #, fuzzy msgid "Missing end quote" msgstr "apice finale mancante" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "aspettavo uno spazio bianco" -#: lexer.ll:244 +#: lexer.ll:245 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:440 +#: lexer.ll:434 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "carattere illegale: `%c'" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "stringa di escape sconosciuta: `\\%s'" -#: lexer.ll:603 +#: lexer.ll:597 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "versione di mudela errata: %s (%s, %s)" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1329,6 +1447,18 @@ msgstr "mi spettavo una traccia MIDI" msgid "invalid track length" msgstr "lunghezza della traccia non valida" +#, fuzzy +#~ msgid "not enough fields in Dstream init" +#~ msgstr "Non ci sono sufficienti campi in Dstream init." + +#, fuzzy +#~ msgid "floating point exception" +#~ msgstr "Eccezione di virgola mobile" + +#, fuzzy +#~ msgid "can't set mem-checking!" +#~ msgstr "non posso settare mem-checking" + #, fuzzy #~ msgid "Dependency file left in `%s'" #~ msgstr "scrivo il file delle dipendenze: `%s'..." diff --git a/po/ja.po b/po/ja.po index cca31021b3..2ef4ff69a0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,146 +13,286 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 +#: ly2dvi.py:88 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 +msgid "warning: " +msgstr "·Ù¹ð: " + +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "¥¨¥é¡¼: " + +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 +#, fuzzy +msgid "Exiting ... " +msgstr "¹Ô ..." + +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" + +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 +msgid "Options:" +msgstr "¥ª¥×¥·¥ç¥ó:" + +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 +#, c-format +msgid "Report bugs to %s" +msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" + +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 +#, fuzzy, c-format +msgid "Invoking `%s'" +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:272 update-lily.py:218 +#, fuzzy, c-format +msgid "Cleaning %s..." +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" + +#: ly2dvi.py:298 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" +msgstr "DIR" + +#: ly2dvi.py:300 +#, fuzzy +msgid "add DIR to LilyPond's search path" +msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" + +#: ly2dvi.py:301 +#, c-format +msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:88 +#: ly2dvi.py:302 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:303 main.cc:116 +msgid "produce MIDI output only" +msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "FILE" + +#: ly2dvi.py:304 +#, fuzzy +msgid "write ouput to FILE" +msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" + +#: ly2dvi.py:306 #, fuzzy msgid "generate PostScript output" msgstr "À©¸Â¤ò´ËÏÂ" -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" +#: ly2dvi.py:307 +msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:90 -msgid "don't run LilyPond" +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:91 main.cc:115 +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: ly2dvi.py:92 main.cc:104 main.cc:114 +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: ly2dvi.py:93 main.cc:106 main.cc:116 +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: ly2dvi.py:94 -msgid "dump all final output into DIR" -msgstr "" +#: ly2dvi.py:336 +#, fuzzy, c-format +msgid "Analyzing %s..." +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:95 main.cc:109 -msgid "write Makefile dependencies for every input file" -msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" +#: ly2dvi.py:381 +#, c-format +msgid "no lilypond output found for %s" +msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 -msgid "warning: " -msgstr "·Ù¹ð: " +#: ly2dvi.py:423 +#, fuzzy, c-format +msgid "invalid value: %s" +msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "¥¨¥é¡¼: " +#: ly2dvi.py:497 ly2dvi.py:514 +#, fuzzy, c-format +msgid "Running %s..." +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:130 -#, fuzzy -msgid "Exiting ... " -msgstr "¹Ô ..." +#: ly2dvi.py:654 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:149 +#: ly2dvi.py:665 #, fuzzy, c-format -msgid "Reading %s..." -msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" +msgid "%s output to %s..." +msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, fuzzy, c-format -msgid "can't open file: `%s'" -msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" +msgid "can't find file: `%s'" +msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" + +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "" -#: ly2dvi.py:216 +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" + +#: mup2ly.py:960 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE" -msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" +msgid "no such context: %s" +msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" +#: mup2ly.py:1109 +msgid "debug" msgstr "" -#: ly2dvi.py:220 main.cc:119 main.cc:146 -msgid "Options:" -msgstr "¥ª¥×¥·¥ç¥ó:" +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" + +#: main.cc:117 mup2ly.py:1112 +#, fuzzy +msgid "write output to FILE" +msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" +#: mup2ly.py:1113 +msgid "only pre-process" msgstr "" -#: ly2dvi.py:226 main.cc:123 main.cc:169 -#, c-format -msgid "Report bugs to %s" -msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" +#: mup2ly.py:1190 +#, fuzzy, c-format +msgid "Processing %s..." +msgstr "½èÍýÃæ..." -#: ly2dvi.py:260 +#: mup2ly.py:1203 #, fuzzy, c-format -msgid "Invoking `%s'" -msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" +msgid "Writing %s..." +msgstr "¹Ô ..." + +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" +msgstr "" -#: ly2dvi.py:263 +#: update-lily.py:238 #, c-format -msgid "command exited with value %d" +msgid "unpack and build in DIR [%s]" msgstr "" -#: ly2dvi.py:265 -msgid "(ignored)" +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" msgstr "" -#: ly2dvi.py:301 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" -#: ly2dvi.py:309 +#: update-lily.py:241 #, c-format -msgid "Analyzing `%s'" +msgid "%n: package name" +msgstr "" + +#: update-lily.py:242 +#, fuzzy +msgid "%r: release directory" +msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" + +#: update-lily.py:243 +msgid "%t: tarball" +msgstr "" + +#: update-lily.py:244 +msgid "%v: package version" msgstr "" -#: ly2dvi.py:353 +#: update-lily.py:247 #, c-format -msgid "no lilypond output found for %s" +msgid "keep all output, and name the directory %s" msgstr "" -#: ly2dvi.py:395 +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" +msgstr "" + +#: update-lily.py:249 +msgid "remove previous build" +msgstr "" + +#: update-lily.py:252 +#, c-format +msgid "fetch and build URL [%s]" +msgstr "" + +#: update-lily.py:358 #, fuzzy, c-format -msgid "invalid value: %s" -msgstr "̵¸ú¤Êʸ»ú: `%c'" +msgid "listing %s..." +msgstr "¹Ô ..." -#: ly2dvi.py:602 scores.cc:44 +#: update-lily.py:418 +#, c-format +msgid "latest is %s" +msgstr "" + +#: update-lily.py:419 +#, c-format +msgid "relax, %s is up to date" +msgstr "" + +#: update-lily.py:427 update-lily.py:439 #, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "%s ¤Ø paper ½ÐÎÏ..." +msgid "fetching %s..." +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:603 +#: update-lily.py:448 #, fuzzy, c-format -msgid "%s output to %s..." -msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" +msgid "building %s..." +msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" #: data-file.cc:54 msgid "EOF in a string" msgstr "ʸ»úÎóÃæ¤Ë EOF ¤¬¤¢¤ê¤Þ¤¹" -#: dstream.cc:186 -msgid "not enough fields in Dstream init" -msgstr "Dstream ½é´ü²½»þ¤Î¥Õ¥£¡¼¥ë¥É¤¬ÉÔ½½Ê¬" - #: getopt-long.cc:145 #, fuzzy, c-format msgid "option `%s' requires an argument" @@ -187,6 +327,12 @@ msgstr " msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, 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" @@ -219,42 +365,42 @@ msgstr " msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 msgid "Loading default font" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, fuzzy, c-format msgid "can't find default font: `%s'" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(¸¡º÷¥Ñ¥¹: `%s')" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "Äü¤á¤Þ¤·¤¿" @@ -335,7 +481,7 @@ msgstr "̵ msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 #, fuzzy msgid "unterminated chord tremolo" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" @@ -349,35 +495,26 @@ msgstr "È¿ msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" -#: debug.cc:26 -msgid "floating point exception" -msgstr "ÉâÆ°¾®¿ôÅÀÎã³°" - -#: debug.cc:50 -#, fuzzy -msgid "can't set mem-checking!" -msgstr "¥á¥â¥ê¥Á¥§¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 #, fuzzy msgid "already have a crescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a decrescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 #, fuzzy msgid "unterminated (de)crescendo" msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" @@ -410,11 +547,11 @@ msgstr " msgid "Unattached grace notes. Attaching to last musical column." msgstr "Áõ¾þ²»É䤬¤Ä¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£Ä¾Á°¤Î¥«¥é¥à¤Ë¤Ä¤±¤Þ¤¹" -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:72 +#: hairpin.cc:94 #, fuzzy msgid "crescendo too small" msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É" @@ -427,13 +564,15 @@ msgstr " msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤ò̵»ë¤·¤Þ¤¹" -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, fuzzy, c-format -msgid "can't find file: `%s'" -msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." +msgstr "" + +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "" -#: key-engraver.cc:103 key-performer.cc:77 +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸" @@ -456,91 +595,72 @@ msgstr "" msgid "Calculating column positions..." msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..." -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:104 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:106 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "DIR" - -#: main.cc:107 +#: main.cc:111 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "FILE" - -#: main.cc:108 +#: main.cc:112 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:111 -msgid "produce MIDI output only" -msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" - -#: main.cc:112 -#, fuzzy -msgid "NAME" -msgstr "BASENAME" - -#: main.cc:112 -#, fuzzy -msgid "write output to NAME" -msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" - -#: main.cc:113 -msgid "inhibit file output naming and exporting" -msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" - -#: main.cc:117 +#: main.cc:115 msgid "EXPR" msgstr "" -#: main.cc:117 +#: main.cc:115 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" +#: main.cc:118 +msgid "inhibit file output naming and exporting" +msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:136 +#: main.cc:140 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:140 +#: main.cc:144 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" @@ -550,11 +670,11 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU " "¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" -#: main.cc:150 +#: main.cc:154 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -570,17 +690,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:194 +#: main.cc:198 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -627,16 +747,16 @@ msgstr "" "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n" "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: midi-item.cc:312 +#: midi-item.cc:138 #, c-format msgid "no such instrument: `%s'" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "Çϼ¯¤²¤¿²»Ä¹" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" @@ -645,23 +765,23 @@ msgstr " msgid "Transposition by %s makes accidental larger than two" msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "" @@ -698,7 +818,7 @@ msgstr " msgid "paper output to %s..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr ", at " @@ -740,9 +860,9 @@ msgstr " msgid "none of these in my family: `%s'" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: percent-repeat-engraver.cc:108 +#: percent-repeat-engraver.cc:118 #, fuzzy -msgid "Don't know yet how to handle this percent repeat." +msgid "Don't know how to handle a percent repeat of this length." msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó" #: percent-repeat-iterator.cc:53 @@ -754,16 +874,16 @@ msgstr "È¿ msgid "Track ... " msgstr "¥È¥é¥Ã¥¯ ..." -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "ºî¶Ê¼Ô: " -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" @@ -800,11 +920,11 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: rest-collision.cc:190 +#: rest-collision.cc:194 msgid "too many colliding rests" msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹" -#: rest-collision.cc:194 +#: rest-collision.cc:198 msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" @@ -826,7 +946,7 @@ msgstr " msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, c-format msgid "unbound spanner `%s'" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" @@ -915,11 +1035,11 @@ msgstr "%s: TFM #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤" @@ -1015,95 +1135,95 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1382 +#: parser.yy:1379 #, fuzzy msgid "Must have duration object" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" -#: parser.yy:1602 +#: parser.yy:1606 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1698 +#: parser.yy:1702 msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:204 +#: lexer.ll:205 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 msgid "Missing end quote" msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "¶õÇò¤¬É¬ÍפǤ¹" -#: lexer.ll:244 +#: lexer.ll:245 msgid "Can't evaluate Scheme in safe mode" msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:440 +#: lexer.ll:434 #, c-format msgid "invalid character: `%c'" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: lexer.ll:603 +#: lexer.ll:597 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1319,6 +1439,28 @@ msgstr "MIDI msgid "invalid track length" msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯Ä¹¤Ç¤¹" +#, fuzzy +#~ msgid "NAME" +#~ msgstr "BASENAME" + +#, fuzzy +#~ msgid "write output to NAME" +#~ msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" + +#, fuzzy +#~ msgid "write ouput to NAME" +#~ msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" + +#~ msgid "not enough fields in Dstream init" +#~ msgstr "Dstream ½é´ü²½»þ¤Î¥Õ¥£¡¼¥ë¥É¤¬ÉÔ½½Ê¬" + +#~ msgid "floating point exception" +#~ msgstr "ÉâÆ°¾®¿ôÅÀÎã³°" + +#, fuzzy +#~ msgid "can't set mem-checking!" +#~ msgstr "¥á¥â¥ê¥Á¥§¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó" + #, fuzzy #~ msgid "Dependency file left in `%s'" #~ msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." diff --git a/po/lilypond.pot b/po/lilypond.pot index ac3781601d..8fcf5408d5 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,141 +14,277 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 +#: ly2dvi.py:88 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 +msgid "warning: " +msgstr "" + +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "" + +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 +msgid "Exiting ... " +msgstr "" + +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 +#, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "" + +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 +msgid "Options:" +msgstr "" + +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 +#, c-format +msgid "Report bugs to %s" +msgstr "" + +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 +#, c-format +msgid "Invoking `%s'" +msgstr "" + +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:272 update-lily.py:218 +#, c-format +msgid "Cleaning %s..." +msgstr "" + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 +#, c-format +msgid "no such setting: %s" +msgstr "" + +#: ly2dvi.py:298 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 msgid "this help" msgstr "" -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" msgstr "" -#: ly2dvi.py:88 -msgid "generate PostScript output" +#: ly2dvi.py:300 +msgid "add DIR to LilyPond's search path" msgstr "" -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" +#: ly2dvi.py:301 +#, c-format +msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:90 +#: ly2dvi.py:302 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:91 main.cc:115 +#: ly2dvi.py:303 main.cc:116 +msgid "produce MIDI output only" +msgstr "" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "" + +#: ly2dvi.py:304 +msgid "write ouput to FILE" +msgstr "" + +#: ly2dvi.py:306 +msgid "generate PostScript output" +msgstr "" + +#: ly2dvi.py:307 +msgid "KEY=VAL" +msgstr "" + +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" +msgstr "" + +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 msgid "verbose" msgstr "" -#: ly2dvi.py:92 main.cc:104 main.cc:114 +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 msgid "print version number" msgstr "" -#: ly2dvi.py:93 main.cc:106 main.cc:116 +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:94 -msgid "dump all final output into DIR" +#: ly2dvi.py:336 +#, c-format +msgid "Analyzing %s..." msgstr "" -#: ly2dvi.py:95 main.cc:109 -msgid "write Makefile dependencies for every input file" +#: ly2dvi.py:381 +#, c-format +msgid "no lilypond output found for %s" msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 -msgid "warning: " +#: ly2dvi.py:423 +#, c-format +msgid "invalid value: %s" msgstr "" -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 -msgid "error: " +#: ly2dvi.py:497 ly2dvi.py:514 +#, c-format +msgid "Running %s..." msgstr "" -#: ly2dvi.py:130 -msgid "Exiting ... " +#: ly2dvi.py:654 scores.cc:44 +#, c-format +msgid "dependencies output to %s..." msgstr "" -#: ly2dvi.py:149 +#: ly2dvi.py:665 #, c-format -msgid "Reading %s..." +msgid "%s output to %s..." msgstr "" -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format -msgid "can't open file: `%s'" +msgid "can't find file: `%s'" msgstr "" -#: ly2dvi.py:216 +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "" + +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" + +#: mup2ly.py:960 #, c-format -msgid "Usage: %s [OPTION]... FILE" +msgid "no such context: %s" msgstr "" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" +#: mup2ly.py:1109 +msgid "debug" msgstr "" -#: ly2dvi.py:220 main.cc:119 main.cc:146 -msgid "Options:" +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" + +#: main.cc:117 mup2ly.py:1112 +msgid "write output to FILE" msgstr "" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" +#: mup2ly.py:1113 +msgid "only pre-process" msgstr "" -#: ly2dvi.py:226 main.cc:123 main.cc:169 +#: mup2ly.py:1190 #, c-format -msgid "Report bugs to %s" +msgid "Processing %s..." msgstr "" -#: ly2dvi.py:260 +#: mup2ly.py:1203 #, c-format -msgid "Invoking `%s'" +msgid "Writing %s..." msgstr "" -#: ly2dvi.py:263 +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" +msgstr "" + +#: update-lily.py:238 #, c-format -msgid "command exited with value %d" +msgid "unpack and build in DIR [%s]" msgstr "" -#: ly2dvi.py:265 -msgid "(ignored)" +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" msgstr "" -#: ly2dvi.py:301 +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" + +#: update-lily.py:241 #, c-format -msgid "no such setting: %s" +msgid "%n: package name" msgstr "" -#: ly2dvi.py:309 +#: update-lily.py:242 +msgid "%r: release directory" +msgstr "" + +#: update-lily.py:243 +msgid "%t: tarball" +msgstr "" + +#: update-lily.py:244 +msgid "%v: package version" +msgstr "" + +#: update-lily.py:247 #, c-format -msgid "Analyzing `%s'" +msgid "keep all output, and name the directory %s" +msgstr "" + +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" msgstr "" -#: ly2dvi.py:353 +#: update-lily.py:249 +msgid "remove previous build" +msgstr "" + +#: update-lily.py:252 #, c-format -msgid "no lilypond output found for %s" +msgid "fetch and build URL [%s]" msgstr "" -#: ly2dvi.py:395 +#: update-lily.py:358 #, c-format -msgid "invalid value: %s" +msgid "listing %s..." msgstr "" -#: ly2dvi.py:602 scores.cc:44 +#: update-lily.py:418 #, c-format -msgid "dependencies output to %s..." +msgid "latest is %s" msgstr "" -#: ly2dvi.py:603 +#: update-lily.py:419 #, c-format -msgid "%s output to %s..." +msgid "relax, %s is up to date" msgstr "" -#: data-file.cc:54 -msgid "EOF in a string" +#: update-lily.py:427 update-lily.py:439 +#, c-format +msgid "fetching %s..." msgstr "" -#: dstream.cc:186 -msgid "not enough fields in Dstream init" +#: update-lily.py:448 +#, c-format +msgid "building %s..." +msgstr "" + +#: data-file.cc:54 +msgid "EOF in a string" msgstr "" #: getopt-long.cc:145 @@ -183,6 +319,12 @@ msgstr "" msgid "can't map file" msgstr "" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "" + #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -215,42 +357,42 @@ msgstr "" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, c-format msgid "can't find font: `%s'" msgstr "" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 msgid "Loading default font" msgstr "" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, c-format msgid "can't find default font: `%s'" msgstr "" -#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "" @@ -325,7 +467,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 msgid "unterminated chord tremolo" msgstr "" @@ -337,31 +479,23 @@ msgstr "" msgid "Too many clashing notecolumns. Ignoring them." msgstr "" -#: debug.cc:26 -msgid "floating point exception" -msgstr "" - -#: debug.cc:50 -msgid "can't set mem-checking!" -msgstr "" - #: dimensions.cc:13 msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 msgid "unterminated (de)crescendo" msgstr "" @@ -393,11 +527,11 @@ msgstr "" msgid "Unattached grace notes. Attaching to last musical column." msgstr "" -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:72 +#: hairpin.cc:94 msgid "crescendo too small" msgstr "" @@ -409,13 +543,15 @@ msgstr "" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, c-format -msgid "can't find file: `%s'" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." msgstr "" -#: key-engraver.cc:103 key-performer.cc:77 +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "" + +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "" @@ -438,98 +574,81 @@ msgstr "" msgid "Calculating column positions..." msgstr "" -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:104 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:106 +#: main.cc:110 msgid "FIELD" msgstr "" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "" - -#: main.cc:107 +#: main.cc:111 msgid "add DIR to search path" msgstr "" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "" - -#: main.cc:108 +#: main.cc:112 msgid "use FILE as init file" msgstr "" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:111 -msgid "produce MIDI output only" -msgstr "" - -#: main.cc:112 -msgid "NAME" +#: main.cc:115 +msgid "EXPR" msgstr "" -#: main.cc:112 -msgid "write output to NAME" +#: main.cc:115 +msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" -#: main.cc:113 +#: main.cc:118 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:117 -msgid "EXPR" -msgstr "" - -#: main.cc:117 -msgid "evalute EXPR as Scheme after .scm init is read" -msgstr "" - #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:136 +#: main.cc:140 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:140 +#: main.cc:144 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:150 +#: main.cc:154 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -537,16 +656,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:194 +#: main.cc:198 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -563,16 +682,16 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:312 +#: midi-item.cc:138 #, c-format msgid "no such instrument: `%s'" msgstr "" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "" @@ -581,23 +700,23 @@ msgstr "" msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "" @@ -634,7 +753,7 @@ msgstr "" msgid "paper output to %s..." msgstr "" -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr "" @@ -676,8 +795,8 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:108 -msgid "Don't know yet how to handle this percent repeat." +#: percent-repeat-engraver.cc:118 +msgid "Don't know how to handle a percent repeat of this length." msgstr "" #: percent-repeat-iterator.cc:53 @@ -688,16 +807,16 @@ msgstr "" msgid "Track ... " msgstr "" -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "" -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "" @@ -732,11 +851,11 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" -#: rest-collision.cc:190 +#: rest-collision.cc:194 msgid "too many colliding rests" msgstr "" -#: rest-collision.cc:194 +#: rest-collision.cc:198 msgid "too many notes for rest collision" msgstr "" @@ -758,7 +877,7 @@ msgstr "" msgid "elapsed time: %.2f seconds" msgstr "" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, c-format msgid "unbound spanner `%s'" msgstr "" @@ -842,11 +961,11 @@ msgstr "" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "" @@ -942,94 +1061,94 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1382 +#: parser.yy:1379 msgid "Must have duration object" msgstr "" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1602 +#: parser.yy:1606 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1698 +#: parser.yy:1702 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:204 +#: lexer.ll:205 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "" -#: lexer.ll:244 +#: lexer.ll:245 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:440 +#: lexer.ll:434 #, c-format msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:603 +#: lexer.ll:597 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "" diff --git a/po/nl.po b/po/nl.po index c61c02fa1e..d95267b662 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.59\n" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "PO-Revision-Date: 2000-06-09 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -20,148 +20,286 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Date: 1998-05-26 11:26:28+0200\n" "From: \n" -"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po --add-comments --keyword=_\n" +"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po " +"--add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 -msgid "this help" -msgstr "deze hulp" - -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" -msgstr "verander globale instelling SLEUTEL in WAARDE" - #: ly2dvi.py:88 -msgid "generate PostScript output" -msgstr "genereer PostScipt uitvoer" - -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" -msgstr "bewaar alle uitvoer, en noem de directory ly2dvi.dir" - -#: ly2dvi.py:90 -msgid "don't run LilyPond" -msgstr "draai LilyPond niet" - -#: ly2dvi.py:91 main.cc:115 -msgid "verbose" -msgstr "breedsprakig" - -#: ly2dvi.py:92 main.cc:104 main.cc:114 -msgid "print version number" -msgstr "druk versienummer af" - -#: ly2dvi.py:93 main.cc:106 main.cc:116 -msgid "show warranty and copyright" -msgstr "toon garantie en auteursrechten" - -#: ly2dvi.py:94 -msgid "dump all final output into DIR" -msgstr "dump alle uiteindelijke uivoer in DIR" - -#: ly2dvi.py:95 main.cc:109 -msgid "write Makefile dependencies for every input file" -msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "Genereer .dvi met LaTeX voor LilyPond" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 msgid "warning: " msgstr "waarschuwing: " -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 msgid "error: " msgstr "fout: " -#: ly2dvi.py:130 +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 msgid "Exiting ... " msgstr "Beëidigen ..." -#: ly2dvi.py:149 -#, c-format -msgid "Reading %s..." -msgstr "Inlezen %s..." - -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 -#, c-format -msgid "can't open file: `%s'" -msgstr "kan bestand niet openen: `%s'" - -#: ly2dvi.py:216 +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Gebruik: %s [OPTIE]... BESTAND" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "Genereer .dvi met LaTeX voor LilyPond" - -#: ly2dvi.py:220 main.cc:119 main.cc:146 +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 msgid "Options:" msgstr "Opties:" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" -msgstr "alle uitvoer wordt naar HUIDIGE directory geschreven" - -#: ly2dvi.py:226 main.cc:123 main.cc:169 +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: ly2dvi.py:260 +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 #, c-format msgid "Invoking `%s'" msgstr "Uitvoeren `%s'" -#: ly2dvi.py:263 +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 #, c-format msgid "command exited with value %d" msgstr "opdracht eindigde met waarde %d" -#: ly2dvi.py:265 +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 msgid "(ignored)" msgstr "(genegeerd)" -#: ly2dvi.py:301 +#: ly2dvi.py:272 update-lily.py:218 +#, c-format +msgid "Cleaning %s..." +msgstr "Schoonmaken %s..." + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 #, c-format msgid "no such setting: %s" msgstr "geen dergelijke instelling: %s" -#: ly2dvi.py:309 +#: ly2dvi.py:298 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 +msgid "this help" +msgstr "deze hulp" + +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" +msgstr "DIR" + +#: ly2dvi.py:300 +msgid "add DIR to LilyPond's search path" +msgstr "voeg DIR toe aan LilyPonds zoekpad" + +#: ly2dvi.py:301 +#, fuzzy, c-format +msgid "keep all output, and name the directory %s.dir" +msgstr "bewaar alle uitvoer, en noem de directory %s" + +#: ly2dvi.py:302 +msgid "don't run LilyPond" +msgstr "draai LilyPond niet" + +#: ly2dvi.py:303 main.cc:116 +msgid "produce MIDI output only" +msgstr "produceer alleen MIDI uitvoer" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "BESTAND" + +#: ly2dvi.py:304 +msgid "write ouput to FILE" +msgstr "schrijf uitvoer naar BESTAND" + +#: ly2dvi.py:306 +msgid "generate PostScript output" +msgstr "genereer PostScipt uitvoer" + +#: ly2dvi.py:307 +msgid "KEY=VAL" +msgstr "SEUTEL=WAARDE" + +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" +msgstr "verander globale instelling SLEUTEL in WAARDE" + +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 +msgid "verbose" +msgstr "breedsprakig" + +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 +msgid "print version number" +msgstr "druk versienummer af" + +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 +msgid "show warranty and copyright" +msgstr "toon garantie en auteursrechten" + +#: ly2dvi.py:336 #, c-format -msgid "Analyzing `%s'" -msgstr "Analyseren `%s'" +msgid "Analyzing %s..." +msgstr "Analyseer %s..." -#: ly2dvi.py:353 +#: ly2dvi.py:381 #, c-format msgid "no lilypond output found for %s" msgstr "geen lilypond uitvoer gevonden voor %s" -#: ly2dvi.py:395 +#: ly2dvi.py:423 #, c-format msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:602 scores.cc:44 +#: ly2dvi.py:497 ly2dvi.py:514 +#, c-format +msgid "Running %s..." +msgstr "Uitvoeren %s..." + +#: ly2dvi.py:654 scores.cc:44 #, c-format msgid "dependencies output to %s..." msgstr "afhankelijkheden uitvoer naar %s..." -#: ly2dvi.py:603 +#: ly2dvi.py:665 #, c-format msgid "%s output to %s..." msgstr "%s uitvoer naar %s..." +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 +#, c-format +msgid "can't find file: `%s'" +msgstr "kan bestand niet vinden: `%s'" + +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "geen BESTANDen gespecificeerd, kan niet uitvoeren als filter" + +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" + +#: mup2ly.py:960 +#, fuzzy, c-format +msgid "no such context: %s" +msgstr "geen dergelijk instrument: `%s'" + +#: mup2ly.py:1109 +msgid "debug" +msgstr "" + +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" + +#: main.cc:117 mup2ly.py:1112 +msgid "write output to FILE" +msgstr "schrijf uitvoer naar BESTAND" + +#: mup2ly.py:1113 +msgid "only pre-process" +msgstr "" + +#: mup2ly.py:1190 +#, fuzzy, c-format +msgid "Processing %s..." +msgstr "Verwerken..." + +#: mup2ly.py:1203 +#, fuzzy, c-format +msgid "Writing %s..." +msgstr "Beëidigen ..." + +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" +msgstr "" + +#: update-lily.py:238 +#, c-format +msgid "unpack and build in DIR [%s]" +msgstr "" + +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" +msgstr "" + +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" + +#: update-lily.py:241 +#, c-format +msgid "%n: package name" +msgstr "" + +#: update-lily.py:242 +#, fuzzy +msgid "%r: release directory" +msgstr "kan directory niet scheppen: `%s'" + +#: update-lily.py:243 +msgid "%t: tarball" +msgstr "" + +#: update-lily.py:244 +msgid "%v: package version" +msgstr "" + +#: update-lily.py:247 +#, c-format +msgid "keep all output, and name the directory %s" +msgstr "bewaar alle uitvoer, en noem de directory %s" + +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" +msgstr "" + +#: update-lily.py:249 +msgid "remove previous build" +msgstr "" + +#: update-lily.py:252 +#, c-format +msgid "fetch and build URL [%s]" +msgstr "" + +#: update-lily.py:358 +#, fuzzy, c-format +msgid "listing %s..." +msgstr "Beëidigen ..." + +#: update-lily.py:418 +#, c-format +msgid "latest is %s" +msgstr "" + +#: update-lily.py:419 +#, c-format +msgid "relax, %s is up to date" +msgstr "" + +#: update-lily.py:427 update-lily.py:439 +#, fuzzy, c-format +msgid "fetching %s..." +msgstr "Inlezen %s..." + +#: update-lily.py:448 +#, fuzzy, c-format +msgid "building %s..." +msgstr "Inlezen %s..." + #: data-file.cc:54 msgid "EOF in a string" msgstr "EOF in een string" -#: dstream.cc:186 -msgid "not enough fields in Dstream init" -msgstr "onvoldoende velden in Dstream init" - #: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" @@ -194,6 +332,12 @@ msgstr "positie onbekend" msgid "can't map file" msgstr "kan bestand niet inkaarten" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "kan bestand niet openen: `%s'" + #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -226,17 +370,17 @@ msgstr "kan teken niet vinden genaamd: `%s'" msgid "Error parsing AFM file: %s" msgstr "Fout bij ontleden AFM bestand: %s" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "checksum fout voor font bestand: `%s'" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "komt niet overeen met: `%s'" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." @@ -244,26 +388,26 @@ msgstr "" "Bouw alle .afm bestanden opnieuw en verwijder alle .pk en .tfm bestanden. " "Voer nog eens uit met -V om font paden te tonen." -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, c-format msgid "can't find font: `%s'" msgstr "kan font niet vinden: `%s'" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 msgid "Loading default font" msgstr "Laad verstek font" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, c-format msgid "can't find default font: `%s'" msgstr "kan verstekfont niet vinden: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(zoekpad: `%s')" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "Geef op" @@ -338,7 +482,7 @@ msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 msgid "unterminated chord tremolo" msgstr "onbeëindigd akkoordtremolo" @@ -350,31 +494,23 @@ msgstr "niemand om tremolos af te drukken" msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." -#: debug.cc:26 -msgid "floating point exception" -msgstr "zwevende komma exceptie" - -#: debug.cc:50 -msgid "can't set mem-checking!" -msgstr "kan geheugen controle niet zetten!" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" @@ -407,11 +543,11 @@ msgstr "geen Grace context voor handen" msgid "Unattached grace notes. Attaching to last musical column." msgstr "Losse grace noten. Maak ze vast aan vorige muziekale kolom." -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "decrescendo te klein" -#: hairpin.cc:72 +#: hairpin.cc:94 msgid "crescendo too small" msgstr "crescendo te klein" @@ -424,13 +560,15 @@ 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." -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, c-format -msgid "can't find file: `%s'" -msgstr "kan bestand niet vinden: `%s'" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." +msgstr "Tegenstrijdige toonsoorten gevonden." + +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "Dit was de andere toonsoort definitie." -#: key-engraver.cc:103 key-performer.cc:77 +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "MAAKME: toonsoort sleutel samenvoeging" @@ -453,87 +591,70 @@ msgstr "Aantal elementen: %d." msgid "Calculating column positions..." msgstr "Berekenen van kolomposities..." -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "liedteksten gevonden zonder bijbehorend nootbolletje" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben." -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:104 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)" -#: main.cc:106 +#: main.cc:110 msgid "FIELD" msgstr "VELD" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "DIR" - -#: main.cc:107 +#: main.cc:111 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "BESTAND" - -#: main.cc:108 +#: main.cc:112 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "voeg DIR voor aan afhankelijkheden" -#: main.cc:111 -msgid "produce MIDI output only" -msgstr "produceer alleen MIDI uitvoer" - -#: main.cc:112 -msgid "NAME" -msgstr "NAAM" - -#: main.cc:112 -msgid "write output to NAME" -msgstr "schrijf uitvoer naar NAAM" - -#: main.cc:113 -msgid "inhibit file output naming and exporting" -msgstr "verbied naamgeving van uitvoer bestand en exportering" - -#: main.cc:117 +#: main.cc:115 msgid "EXPR" msgstr "EXPR" -#: main.cc:117 +#: main.cc:115 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "evalueer EXPR als Scheme nadat .scm init is gelezen" +#: main.cc:118 +msgid "inhibit file output naming and exporting" +msgstr "verbied naamgeving van uitvoer bestand en exportering" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:136 +#: main.cc:140 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:140 +#: main.cc:144 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" @@ -543,11 +664,11 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:150 +#: main.cc:154 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -559,16 +680,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:194 +#: main.cc:198 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -598,16 +719,16 @@ msgstr "" "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n" "675 Mass Ave, Cambridge, MA 02139, USA.\n" -#: midi-item.cc:312 +#: midi-item.cc:138 #, c-format msgid "no such instrument: `%s'" msgstr "geen dergelijk instrument: `%s'" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "rare duur" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "rare toonhoogte" @@ -616,23 +737,23 @@ msgstr "rare toonhoogte" msgid "Transposition by %s makes accidental larger than two" msgstr "Transponering van %s geeft tripel kruizen/mollen" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "ly_get_mus_property (): Geen Muziek" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "ly_set_mus_property (): Geen symbool" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "ly_set_mus_property (): niet van type Muziek" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "ly_make_music (): Geen string" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "ly_make_music (): Geen muziek expressie" @@ -669,7 +790,7 @@ msgstr "Schroot verzoek: `%s'" msgid "paper output to %s..." msgstr "papier uitvoer naar %s..." -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr ", bij " @@ -711,8 +832,9 @@ msgstr "Ben er zelf een: `%s'" msgid "none of these in my family: `%s'" msgstr "geen van deze in mijn gezin: `%s'" -#: percent-repeat-engraver.cc:108 -msgid "Don't know yet how to handle this percent repeat." +#: percent-repeat-engraver.cc:118 +#, fuzzy +msgid "Don't know how to handle a percent repeat of this length." msgstr "Weet nog niet hoe deze procent herhaling af te handelen." #: percent-repeat-iterator.cc:53 @@ -723,16 +845,16 @@ msgstr "niemand om een procent herhaling af te drukken" msgid "Track ... " msgstr "Spoor ... " -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "Schepper: " -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." @@ -769,11 +891,11 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Verkeerd type voor property: %s, type: %s, gevonden: %s, type: %s" -#: rest-collision.cc:190 +#: rest-collision.cc:194 msgid "too many colliding rests" msgstr "te veel botsende rusten" -#: rest-collision.cc:194 +#: rest-collision.cc:198 msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" @@ -795,7 +917,7 @@ msgstr "Fouten gevonden, /*verwerk partituur niet */" msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, c-format msgid "unbound spanner `%s'" msgstr "ongebonden spanner `%s'" @@ -880,11 +1002,11 @@ msgstr "" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "Geen overbindingen geschapen!" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "eenzame overbinding" @@ -982,94 +1104,94 @@ msgstr "Tweede argument moet een symbool zijn" msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "Verwacht musical-pitch waarde" -#: parser.yy:1382 +#: parser.yy:1379 msgid "Must have duration object" msgstr "Moet duur object hebben" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1602 +#: parser.yy:1606 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" -#: parser.yy:1698 +#: parser.yy:1702 msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "heb integer getal arg nogig" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "Moet positieve integer zijn" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "EOF gevonden in een kommentaar" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "\\maininput niet toegestaan buiten init bestanden" -#: lexer.ll:204 +#: lexer.ll:205 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "verkeerde of ongedefiniëerde identifier: `%s'" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 msgid "Missing end quote" msgstr "Aanhalingsteken sluiten mist" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "wit verwacht" -#: lexer.ll:244 +#: lexer.ll:245 msgid "Can't evaluate Scheme in safe mode" msgstr "Kan Scheme niet evalueren in veilige modus" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "Accolade gevonden aan het eind van liedtektst. Een spatie vergeten?" -#: lexer.ll:440 +#: lexer.ll:434 #, c-format msgid "invalid character: `%c'" msgstr "ongeldig teken: `%c'" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "onbekende ontsnapte string: `\\%s'" -#: lexer.ll:603 +#: lexer.ll:597 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "verkeerde lilypond versie: %s (%s, %s)" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "Overweeg de invoer te converteren met het convert-ly script" @@ -1281,3 +1403,30 @@ msgstr "MIDI spoor verwacht" #: midi-track-parser.cc:353 msgid "invalid track length" msgstr "ongeldige spoorlengte" + +#~ msgid "keep all output, and name the directory ly2dvi.dir" +#~ msgstr "bewaar alle uitvoer, en noem de directory ly2dvi.dir" + +#~ msgid "NAME" +#~ msgstr "NAAM" + +#~ msgid "write output to NAME" +#~ msgstr "schrijf uitvoer naar NAAM" + +#~ msgid "write ouput to NAME" +#~ msgstr "schrijf uitvoer naar NAAM" + +#~ msgid "dump all final output into DIR" +#~ msgstr "dump alle uiteindelijke uivoer in DIR" + +#~ msgid "all output is written in the CURRENT directory" +#~ msgstr "alle uitvoer wordt naar HUIDIGE directory geschreven" + +#~ msgid "not enough fields in Dstream init" +#~ msgstr "onvoldoende velden in Dstream init" + +#~ msgid "floating point exception" +#~ msgstr "zwevende komma exceptie" + +#~ msgid "can't set mem-checking!" +#~ msgstr "kan geheugen controle niet zetten!" diff --git a/po/ru.po b/po/ru.po index 084e6304ff..0ec9012399 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-03-21 16:06+0100\n" +"POT-Creation-Date: 2001-04-02 13:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -14,144 +14,284 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:86 main.cc:95 main.cc:105 +#: ly2dvi.py:88 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" + +#: data-file.cc:118 input.cc:85 ly2dvi.py:167 midi-parser.cc:100 mup2ly.py:93 +#: update-lily.py:113 warn.cc:23 +msgid "warning: " +msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " + +#: input.cc:90 ly2dvi.py:172 mup2ly.py:98 mup2ly.py:186 update-lily.py:118 +#: update-lily.py:206 warn.cc:9 warn.cc:17 +msgid "error: " +msgstr "ÏÛÉÂËÁ: " + +#: ly2dvi.py:174 mup2ly.py:100 update-lily.py:120 +msgid "Exiting ... " +msgstr "" + +#: ly2dvi.py:232 mup2ly.py:158 update-lily.py:178 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE" +msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" + +#: ly2dvi.py:236 main.cc:119 main.cc:150 mup2ly.py:162 update-lily.py:182 +msgid "Options:" +msgstr "ïÐÃÉÉ:" + +#: ly2dvi.py:240 main.cc:123 main.cc:173 mup2ly.py:166 update-lily.py:186 +#, c-format +msgid "Report bugs to %s" +msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" + +#: ly2dvi.py:256 mup2ly.py:183 update-lily.py:203 +#, fuzzy, c-format +msgid "Invoking `%s'" +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" + +#: ly2dvi.py:260 mup2ly.py:186 update-lily.py:206 +#, c-format +msgid "command exited with value %d" +msgstr "" + +#: ly2dvi.py:262 mup2ly.py:188 update-lily.py:208 +msgid "(ignored)" +msgstr "" + +#: ly2dvi.py:272 update-lily.py:218 +#, fuzzy, c-format +msgid "Cleaning %s..." +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" + +#: ly2dvi.py:286 mup2ly.py:212 update-lily.py:232 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" + +#: ly2dvi.py:298 main.cc:113 +msgid "write Makefile dependencies for every input file" +msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" + +#: ly2dvi.py:299 main.cc:95 main.cc:109 mup2ly.py:1111 update-lily.py:246 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: ly2dvi.py:87 -msgid "change global setting KEY to VAL" +#: ly2dvi.py:300 main.cc:111 main.cc:114 +msgid "DIR" +msgstr "ëáô" + +#: ly2dvi.py:300 +#, fuzzy +msgid "add DIR to LilyPond's search path" +msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" + +#: ly2dvi.py:301 +#, c-format +msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:88 +#: ly2dvi.py:302 +msgid "don't run LilyPond" +msgstr "" + +#: ly2dvi.py:303 main.cc:116 +msgid "produce MIDI output only" +msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" + +#: ly2dvi.py:304 main.cc:98 main.cc:112 main.cc:117 +msgid "FILE" +msgstr "æáêì" + +#: ly2dvi.py:304 +#, fuzzy +msgid "write ouput to FILE" +msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" + +#: ly2dvi.py:306 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:89 -msgid "keep all output, and name the directory ly2dvi.dir" +#: ly2dvi.py:307 +msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:90 -msgid "don't run LilyPond" +#: ly2dvi.py:307 +msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:91 main.cc:115 +#: ly2dvi.py:308 main.cc:120 mup2ly.py:1114 update-lily.py:250 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: ly2dvi.py:92 main.cc:104 main.cc:114 +#: ly2dvi.py:309 main.cc:104 main.cc:119 mup2ly.py:1115 update-lily.py:251 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: ly2dvi.py:93 main.cc:106 main.cc:116 +#: ly2dvi.py:310 main.cc:106 main.cc:121 mup2ly.py:1116 update-lily.py:253 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:94 -msgid "dump all final output into DIR" -msgstr "" +#: ly2dvi.py:336 +#, fuzzy, c-format +msgid "Analyzing %s..." +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:95 main.cc:109 -msgid "write Makefile dependencies for every input file" -msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" +#: ly2dvi.py:381 +#, c-format +msgid "no lilypond output found for %s" +msgstr "" -#: data-file.cc:118 input.cc:85 ly2dvi.py:123 midi-parser.cc:100 warn.cc:23 -msgid "warning: " -msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " +#: ly2dvi.py:423 +#, fuzzy, c-format +msgid "invalid value: %s" +msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: input.cc:90 ly2dvi.py:128 ly2dvi.py:263 warn.cc:9 warn.cc:17 -msgid "error: " -msgstr "ÏÛÉÂËÁ: " +#: ly2dvi.py:497 ly2dvi.py:514 +#, fuzzy, c-format +msgid "Running %s..." +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:130 -msgid "Exiting ... " -msgstr "" +#: ly2dvi.py:654 scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:149 +#: ly2dvi.py:665 #, fuzzy, c-format -msgid "Reading %s..." -msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" +msgid "%s output to %s..." +msgstr "×Ù×ÏÄ MIDI × %s..." -#: lilypond-stream.cc:111 ly2dvi.py:153 mapped-file-storage.cc:87 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667 +#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format -msgid "can't open file: `%s'" -msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" +msgid "can't find file: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" + +#: ly2dvi.py:677 +msgid "no FILEs specified, can't invoke as filter" +msgstr "" -#: ly2dvi.py:216 +#: mup2ly.py:51 +msgid "Convert mup to ly" +msgstr "" + +#: mup2ly.py:960 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... FILE" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" +msgid "no such context: %s" +msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: ly2dvi.py:218 -msgid "Generate .dvi with LaTeX for LilyPond" +#: mup2ly.py:1109 +msgid "debug" msgstr "" -#: ly2dvi.py:220 main.cc:119 main.cc:146 -msgid "Options:" -msgstr "ïÐÃÉÉ:" +#: mup2ly.py:1110 +msgid "define macro NAME [optional expansion EXP]" +msgstr "" + +#: main.cc:117 mup2ly.py:1112 +#, fuzzy +msgid "write output to FILE" +msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: ly2dvi.py:224 -msgid "all output is written in the CURRENT directory" +#: mup2ly.py:1113 +msgid "only pre-process" msgstr "" -#: ly2dvi.py:226 main.cc:123 main.cc:169 -#, c-format -msgid "Report bugs to %s" -msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" +#: mup2ly.py:1190 +#, fuzzy, c-format +msgid "Processing %s..." +msgstr "ïÂÒÁÂÁÔÙ×ÁÀ..." -#: ly2dvi.py:260 +#: mup2ly.py:1203 #, fuzzy, c-format -msgid "Invoking `%s'" +msgid "Writing %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:263 +#: update-lily.py:46 +msgid "Fetch and rebuild from latest source package" +msgstr "" + +#: update-lily.py:238 #, c-format -msgid "command exited with value %d" +msgid "unpack and build in DIR [%s]" msgstr "" -#: ly2dvi.py:265 -msgid "(ignored)" +#: update-lily.py:239 +msgid "execute COMMAND, subtitute:" msgstr "" -#: ly2dvi.py:301 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" +#: update-lily.py:240 +msgid "%b: build root" +msgstr "" -#: ly2dvi.py:309 +#: update-lily.py:241 #, c-format -msgid "Analyzing `%s'" +msgid "%n: package name" +msgstr "" + +#: update-lily.py:242 +#, fuzzy +msgid "%r: release directory" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" + +#: update-lily.py:243 +msgid "%t: tarball" +msgstr "" + +#: update-lily.py:244 +msgid "%v: package version" msgstr "" -#: ly2dvi.py:353 +#: update-lily.py:247 #, c-format -msgid "no lilypond output found for %s" +msgid "keep all output, and name the directory %s" msgstr "" -#: ly2dvi.py:395 +#: update-lily.py:248 +msgid "upon failure notify EMAIL[,EMAIL]" +msgstr "" + +#: update-lily.py:249 +msgid "remove previous build" +msgstr "" + +#: update-lily.py:252 +#, c-format +msgid "fetch and build URL [%s]" +msgstr "" + +#: update-lily.py:358 #, fuzzy, c-format -msgid "invalid value: %s" -msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" +msgid "listing %s..." +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:602 scores.cc:44 +#: update-lily.py:418 +#, c-format +msgid "latest is %s" +msgstr "" + +#: update-lily.py:419 +#, c-format +msgid "relax, %s is up to date" +msgstr "" + +#: update-lily.py:427 update-lily.py:439 #, fuzzy, c-format -msgid "dependencies output to %s..." -msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." +msgid "fetching %s..." +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:603 +#: update-lily.py:448 #, fuzzy, c-format -msgid "%s output to %s..." -msgstr "×Ù×ÏÄ MIDI × %s..." +msgid "building %s..." +msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" #: data-file.cc:54 msgid "EOF in a string" msgstr "EOF × ÓÔÒÏËÅ" -#: dstream.cc:186 -msgid "not enough fields in Dstream init" -msgstr "ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÅÊ × Dstream init" - #: getopt-long.cc:145 #, c-format msgid "option `%s' requires an argument" @@ -184,6 +324,12 @@ msgstr " msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" +#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:40 +#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#, c-format +msgid "can't open file: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" + #: simple-file-storage.cc:56 #, c-format msgid "Huh? Got %d, expected %d characters" @@ -216,42 +362,42 @@ msgstr " msgid "Error parsing AFM file: %s" msgstr "ïÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ÆÁÊÌÁ AFM" -#: all-font-metrics.cc:84 +#: all-font-metrics.cc:95 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:86 +#: all-font-metrics.cc:97 #, c-format msgid "does not match: `%s'" msgstr "" -#: all-font-metrics.cc:91 +#: all-font-metrics.cc:102 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:155 +#: all-font-metrics.cc:167 #, c-format msgid "can't find font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'" -#: all-font-metrics.cc:156 +#: all-font-metrics.cc:168 msgid "Loading default font" msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: all-font-metrics.cc:171 +#: all-font-metrics.cc:183 #, c-format msgid "can't find default font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:51 scores.cc:137 +#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')" -#: all-font-metrics.cc:173 parser.yy:1681 +#: all-font-metrics.cc:185 parser.yy:1685 msgid "Giving up" msgstr "óÄÁÀÓØ" @@ -326,7 +472,7 @@ msgstr " msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" @@ -339,31 +485,23 @@ msgstr " msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." -#: debug.cc:26 -msgid "floating point exception" -msgstr "ÉÓËÌÀÞÅÎÉÅ ÁÒÉÆÍÅÔÉËÉ Ó ÐÌÁ×ÁÀÝÅÊ ÚÁÐÑÔÏÊ" - -#: debug.cc:50 -msgid "can't set mem-checking!" -msgstr "ÎÅ ÍÏÇÕ ×ËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ÐÁÍÑÔÉ" - #: dimensions.cc:13 msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:223 +#: dynamic-engraver.cc:222 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:224 +#: dynamic-engraver.cc:223 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:318 +#: dynamic-engraver.cc:317 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" @@ -395,11 +533,11 @@ msgstr " msgid "Unattached grace notes. Attaching to last musical column." msgstr "æÏÒÛÌÁÇ ÂÅÚ ÐÒÉ×ÑÚËÉ. ðÒÉ×ÑÚÙ×ÁÀ Ë ÐÏÓÌÅÄÎÅÍÕ ÍÕÚÙËÁÌØÎÏÍÕ ÓÔÏÌÂÃÕ." -#: hairpin.cc:71 +#: hairpin.cc:93 msgid "decrescendo too small" msgstr "" -#: hairpin.cc:72 +#: hairpin.cc:94 #, fuzzy msgid "crescendo too small" msgstr "ËÒÅÝÅÎÄÏ" @@ -412,13 +550,15 @@ msgstr " msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "îÅ Ë ÞÅÍÕ ÐÒÉÓÏÅÄÉÎÉÔØ ÐÅÒÅÎÏÓ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÐÅÒÅÎÏÓÁ." -#: includable-lexer.cc:49 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:136 scores.cc:142 -#, c-format -msgid "can't find file: `%s'" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" +#: key-engraver.cc:99 +msgid "Conflicting key signatures found." +msgstr "" + +#: key-engraver.cc:100 +msgid "This was the other key definition." +msgstr "" -#: key-engraver.cc:103 key-performer.cc:77 +#: key-performer.cc:77 msgid "FIXME: key change merge" msgstr "éóðòá÷øíåîñ: ÓÌÉÑÎÉÅ ÓÍÅÎÙ ËÌÀÞÁ" @@ -441,91 +581,72 @@ msgstr "" msgid "Calculating column positions..." msgstr "÷ÙÞÉÓÌÑÀ ÐÏÚÉÃÉÉ ÓÔÏÌÂÃÏ×" -#: lyric-phrasing-engraver.cc:269 +#: lyric-phrasing-engraver.cc:284 msgid "lyrics found without any matching notehead" msgstr "" -#: lyric-phrasing-engraver.cc:274 +#: lyric-phrasing-engraver.cc:289 msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:104 +#. another bug in option parser: --output=foe is taken as an abbreviation +#. for --output-format +#. {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, +#: main.cc:108 msgid "EXT" msgstr "òáóû" -#: main.cc:104 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:106 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:106 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:107 main.cc:110 -msgid "DIR" -msgstr "ëáô" - -#: main.cc:107 +#: main.cc:111 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:98 main.cc:108 -msgid "FILE" -msgstr "æáêì" - -#: main.cc:108 +#: main.cc:112 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:110 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:111 -msgid "produce MIDI output only" -msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" - -#: main.cc:112 -#, fuzzy -msgid "NAME" -msgstr "ïóîï÷á" - -#: main.cc:112 -#, fuzzy -msgid "write output to NAME" -msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" - -#: main.cc:113 -msgid "inhibit file output naming and exporting" -msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" - -#: main.cc:117 +#: main.cc:115 msgid "EXPR" msgstr "" -#: main.cc:117 +#: main.cc:115 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "" +#: main.cc:118 +msgid "inhibit file output naming and exporting" +msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:134 +#: main.cc:138 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:136 +#: main.cc:140 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:140 +#: main.cc:144 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" @@ -535,11 +656,11 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:150 +#: main.cc:154 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:55 main.cc:177 +#: main.cc:55 main.cc:181 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -551,17 +672,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:62 main.cc:184 main.cc:196 +#: main.cc:62 main.cc:188 main.cc:200 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:194 +#: main.cc:198 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:71 main.cc:202 +#: main.cc:71 main.cc:206 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" @@ -578,16 +699,16 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:312 +#: midi-item.cc:138 #, c-format msgid "no such instrument: `%s'" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: midi-item.cc:402 +#: midi-item.cc:227 msgid "silly duration" msgstr "ÇÌÕÐÁÑ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: midi-item.cc:415 +#: midi-item.cc:240 msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" @@ -596,23 +717,23 @@ msgstr " msgid "Transposition by %s makes accidental larger than two" msgstr "" -#: music.cc:224 +#: music.cc:232 msgid "ly_get_mus_property (): Not a Music" msgstr "" -#: music.cc:238 +#: music.cc:246 msgid "ly_set_mus_property (): Not a symbol" msgstr "" -#: music.cc:250 +#: music.cc:258 msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: music.cc:264 +#: music.cc:272 msgid "ly_make_music (): Not a string" msgstr "" -#: music.cc:284 +#: music.cc:292 msgid "ly_music_name (): Not a music expression" msgstr "" @@ -649,7 +770,7 @@ msgstr " msgid "paper output to %s..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:95 +#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99 msgid ", at " msgstr ", ×" @@ -691,9 +812,9 @@ msgstr " msgid "none of these in my family: `%s'" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: percent-repeat-engraver.cc:108 +#: percent-repeat-engraver.cc:118 #, fuzzy -msgid "Don't know yet how to handle this percent repeat." +msgid "Don't know how to handle a percent repeat of this length." msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ" #: percent-repeat-iterator.cc:53 @@ -705,16 +826,16 @@ msgstr " msgid "Track ... " msgstr "äÏÒÏÖËÁ ..." -#: performance.cc:79 +#: performance.cc:83 msgid "Creator: " msgstr "óÏÚÄÁÔÅÌØ: " -#: performance.cc:109 +#: performance.cc:113 #, c-format msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" -#: performance.cc:164 +#: performance.cc:168 #, c-format msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." @@ -751,11 +872,11 @@ msgstr "" msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" -#: rest-collision.cc:190 +#: rest-collision.cc:194 msgid "too many colliding rests" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÎÁÌÅÚÁÀÝÉÈ ÐÁÕÚ" -#: rest-collision.cc:194 +#: rest-collision.cc:198 msgid "too many notes for rest collision" msgstr "" @@ -777,7 +898,7 @@ msgstr " msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" -#: score-engraver.cc:183 +#: score-engraver.cc:188 #, c-format msgid "unbound spanner `%s'" msgstr "" @@ -866,11 +987,11 @@ msgstr "" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? -#: tie-engraver.cc:215 tie-performer.cc:173 +#: tie-engraver.cc:220 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:234 +#: tie-engraver.cc:240 msgid "lonely tie" msgstr "" @@ -966,95 +1087,95 @@ msgstr " msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1236 +#: parser.yy:1233 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1246 +#: parser.yy:1243 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1371 +#: parser.yy:1368 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1382 +#: parser.yy:1379 #, fuzzy msgid "Must have duration object" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: parser.yy:1391 parser.yy:1399 parser.yy:1679 +#: parser.yy:1388 parser.yy:1396 parser.yy:1683 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1564 parser.yy:1593 +#: parser.yy:1549 parser.yy:1597 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1602 +#: parser.yy:1606 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" -#: parser.yy:1698 +#: parser.yy:1702 msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:1860 parser.yy:1878 +#: parser.yy:1864 parser.yy:1882 msgid "need integer number arg" msgstr "" -#: parser.yy:1864 +#: parser.yy:1868 msgid "Must be positive integer" msgstr "" -#: lexer.ll:166 +#: lexer.ll:167 msgid "EOF found inside a comment" msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ" -#: lexer.ll:180 +#: lexer.ll:181 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:204 +#: lexer.ll:205 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'" #. backup rule -#: lexer.ll:209 +#: lexer.ll:210 msgid "Missing end quote" msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ" #. backup rule -#: lexer.ll:231 lexer.ll:235 +#: lexer.ll:232 lexer.ll:236 msgid "white expected" msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ" -#: lexer.ll:244 +#: lexer.ll:245 msgid "Can't evaluate Scheme in safe mode" msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ" -#: lexer.ll:336 +#: lexer.ll:330 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:440 +#: lexer.ll:434 #, c-format msgid "invalid character: `%c'" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: lexer.ll:521 +#: lexer.ll:515 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: lexer.ll:603 +#: lexer.ll:597 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)" -#: lexer.ll:604 +#: lexer.ll:598 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1269,6 +1390,27 @@ msgstr " msgid "invalid track length" msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÄÏÒÏÖËÉ" +#, fuzzy +#~ msgid "NAME" +#~ msgstr "ïóîï÷á" + +#, fuzzy +#~ msgid "write output to NAME" +#~ msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" + +#, fuzzy +#~ msgid "write ouput to NAME" +#~ msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" + +#~ msgid "not enough fields in Dstream init" +#~ msgstr "ÎÅ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÅÊ × Dstream init" + +#~ msgid "floating point exception" +#~ msgstr "ÉÓËÌÀÞÅÎÉÅ ÁÒÉÆÍÅÔÉËÉ Ó ÐÌÁ×ÁÀÝÅÊ ÚÁÐÑÔÏÊ" + +#~ msgid "can't set mem-checking!" +#~ msgstr "ÎÅ ÍÏÇÕ ×ËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ÐÁÍÑÔÉ" + #, fuzzy #~ msgid "Dependency file left in `%s'" #~ msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 56de2cb14a..cc2be23f75 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -1,5 +1,13 @@ #!@PYTHON@ -# run lily, setup LaTeX input. +# Run lilypond, latex, dvips. +# +# This is the third incarnation of ly2dvi. +# +# Earlier incarnations of ly2dvi were written by +# Jeffrey B. Reed (Python version) +# Jan Arne Fagertun (Bourne shell script) +# + # Note: gettext work best if we use ' for docstrings and " # for gettextable strings @@ -7,8 +15,20 @@ ''' TODO: - * check --dependencies + * figure out which set of command line options should make ly2dvi: + na: create tex only? + na: create latex only? + na: create tex and latex + default: create dvi only + na: create tex, latex and dvi + -P: create dvi and ps + na: * create ps only + + etc. + + for foo.ly, rename ly2dvi.dir to out-ly2dvi, foo.ly2dvi, foo.dir ? + * move versatile taglines, \header { @@ -73,17 +93,23 @@ extra_fields = extra_init.keys () fields = layout_fields + extra_fields program_name = 'ly2dvi' -help_summary = _("Generate .dvi with LaTeX for LilyPond") +help_summary = _ ("Generate .dvi with LaTeX for LilyPond") include_path = ['.'] -no_lily = 0 -outdir = '.' +lily_p = 1 +paper_p = 1 + +output = 0 +targets = { + 'DVI' : 0, + 'LATEX' : 0, + 'MIDI' : 0, + 'TEX' : 0, + } + track_dependencies_p = 0 dependency_files = [] -# generate ps ? -postscript_p = 0 - # be verbose? verbose_p = 0 @@ -221,8 +247,6 @@ def help (): sys.stdout.write ('\n\n') sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org') sys.stdout.write ('\n') - sys.exit (0) - def setup_temp (): global temp_dir @@ -238,11 +262,12 @@ def setup_temp (): def system (cmd, ignore_error = 0): if verbose_p: progress (_ ("Invoking `%s\'") % cmd) - st = os.system (cmd) + st = os.system (cmd) >> 8 if st: - msg = ( _ ("error: ") + _ ("command exited with value %d") % st) + name = re.match ('[ \t]*([^ \t]*)', cmd).group (1) + msg = name + ': ' + _ ("command exited with value %d") % st if ignore_error: - sys.stderr.write (msg + ' ' + _ ("(ignored)") + ' ') + warning (msg + ' ' + _ ("(ignored)") + ' ') else: error (msg) @@ -278,36 +303,45 @@ def strip_extension (f, ext): # END Library option_definitions = [ + ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")), ('', 'h', 'help', _ ("this help")), - ('KEY=VAL', 's', 'set', _ ("change global setting KEY to VAL")), - ('DIR', 'I', 'include', _ ("add DIR to LilyPond\'s search path")), - ('', 'P', 'postscript', _ ("generate PostScript output")), - ('', 'k', 'keep', _ ("keep all output, and name the directory ly2dvi.dir")), + (_ ("DIR"), 'I', 'include', _ ("add DIR to LilyPond's search path")), + ('', 'k', 'keep', _ ("keep all output, and name the directory %s.dir") % program_name), ('', '', 'no-lily', _ ("don't run LilyPond")), + ('', 'm', 'no-paper', _ ("produce MIDI output only")), + (_ ("FILE"), 'o', 'output', _ ("write ouput to FILE")), + # why capital P? + ('', 'P', 'postscript', _ ("generate PostScript output")), + (_ ("KEY=VAL"), 's', 'set', _ ("change global setting KEY to VAL")), ('', 'V', 'verbose', _ ("verbose")), ('', 'v', 'version', _ ("print version number")), ('', 'w', 'warranty', _ ("show warranty and copyright")), - ('DIR', '', 'outdir', _ ("dump all final output into DIR")), - ('', 'd', 'dependencies', _ ("write Makefile dependencies for every input file")), ] -def run_lilypond (files): - opts = '' +def run_lilypond (files, outbase, dep_prefix): + opts = '--output=%s.tex' % outbase opts = opts + ' ' + string.join (map (lambda x : '-I ' + x, include_path)) - opts = opts + ' ' + string.join (map (lambda x : '-H ' + x, fields)) - + if paper_p: + opts = opts + ' ' + string.join (map (lambda x : '-H ' + x, fields)) + else: + opts = opts + ' --no-paper' + if track_dependencies_p: - opts = opts + " --dependencies " + opts = opts + " --dependencies" + if dep_prefix: + opts = ' --dep_prefix=%s' % dep_prefix fs = string.join (files) - - system ('lilypond %s %s ' % (opts, fs)) + + system ('lilypond %s %s ' % (opts, fs)) def analyse_lilypond_output (filename, extra): + + # urg '''Grep FILENAME for interesting stuff, and put relevant info into EXTRA.''' filename = filename+'.tex' - progress (_ ("Analyzing `%s'") % filename) + progress (_ ("Analyzing %s...") % filename) s = open (filename).read () # search only the first 10k @@ -335,6 +369,7 @@ def find_tex_files_for_base (base, extra): def find_tex_files (files, extra): tfiles = [] + for f in files: x = 0 while 1: @@ -457,27 +492,22 @@ def global_latex_definition (tfiles, extra): return s -def do_files (fs, extra): - - '''process the list of filenames in FS, using standard settings in EXTRA. - ''' - if not no_lily: - run_lilypond (fs) - - wfs = find_tex_files (fs, extra) +def run_latex (files, outbase, extra): + wfs = find_tex_files ([outbase] + files[1:], extra) s = global_latex_definition (wfs, extra) - latex_file ='ly2dvi.out' - f = open (latex_file + '.tex', 'w') + f = open (outbase + '.latex', 'w') f.write (s) f.close () - # todo: nonstopmode - system ('latex \\\\nonstopmode \\\\input %s' % latex_file) - return latex_file + '.dvi' + cmd = 'latex \\\\nonstopmode \\\\input %s' % outbase + '.latex' + if not verbose_p: + progress ( _("Running %s...") % 'LaTeX') + cmd = cmd + ' 1> /dev/null 2> /dev/null' -def generate_postscript (dvi_name, extra): - '''Run dvips on DVI_NAME, optionally doing -t landscape''' + system (cmd) + +def run_dvips (outbase, extra): opts = '' if extra['papersize']: @@ -486,12 +516,13 @@ def generate_postscript (dvi_name, extra): if extra['orientation'] and extra['orientation'][0] == 'landscape': opts = opts + ' -t landscape' - ps_name = re.sub (r'\.dvi', r'.ps', dvi_name) - system ('dvips %s -o %s %s' % (opts, ps_name, dvi_name)) - - return ps_name + cmd = 'dvips %s -o %s %s' % (opts, outbase + '.ps', outbase + '.dvi') + + if not verbose_p: + progress ( _("Running %s...") % 'dvips') + cmd = cmd + ' 2> /dev/null' - + system (cmd) def generate_dependency_file (depfile, outname): df = open (depfile, 'w') @@ -525,16 +556,21 @@ for opt in options: pass elif o == '--help' or o == '-h': help () + sys.exit (0) elif o == '--include' or o == '-I': include_path.append (a) elif o == '--postscript' or o == '-P': - postscript_p = 1 + targets['PS'] = 0 elif o == '--keep' or o == '-k': keep_temp_dir_p = 1 elif o == '--no-lily': - no_lily = 1 - elif o == '--outdir': - outdir = a + lily_p = 0 + elif o == '--no-paper' or o == '-m': + targets = {} + targets['MIDI'] = 0 + paper_p = 0 + elif o == '--output' or o == '-o': + output = a elif o == '--set' or o == '-s': ss = string.split (a, '=') set_setting (extra_init, ss[0], ss[1]) @@ -546,7 +582,10 @@ for opt in options: identify () sys.exit (0) elif o == '--warranty' or o == '-w': - warranty () + try: + system ('lilypond -w') + except: + warranty () sys.exit (0) # On most platforms, this is equivalent to @@ -555,73 +594,99 @@ def compat_abspath (path): return os.path.normpath (os.path.join (os.getcwd (), path)) include_path = map (compat_abspath, include_path) -files = map (compat_abspath, files) -outdir = compat_abspath (outdir) - -files = map (lambda x: strip_extension (x, '.ly'), files) +original_output = output -if files: - setup_temp () - setup_environment () - - extra = extra_init - - dvi_name = do_files (files, extra) +if files and files[0] != '-': - if postscript_p: - ps_name = generate_postscript (dvi_name, extra) + files = map (lambda x: strip_extension (x, '.ly'), files) + if not output: + output = os.path.basename (files[0]) + files = map (compat_abspath, files) - base = os.path.basename (files[0]) - dest = base - type = 'foobar' - srcname = 'foobar' - - if postscript_p: - srcname = ps_name - dest = dest + '.ps' - type = 'PS' + if os.path.dirname (output) != '.': + dep_prefix = os.path.dirname (output) else: - srcname = dvi_name - dest= dest + '.dvi' - type = 'DVI' + dep_prefix = 0 - dest = os.path.join (outdir, dest) - midi = base + '.midi' - midi = os.path.join (outdir, midi) + reldir = os.path.dirname (output) + (outdir, outbase) = os.path.split (compat_abspath (output)) + + setup_environment () + setup_temp () - if outdir != '.': + extra = extra_init + + if lily_p: + try: + run_lilypond (files, outbase, dep_prefix) + except: + # TODO: friendly message about LilyPond setup/failing? + # + # TODO: lilypond should fail with different + # error codes for: + # - guile setup/startup failure + # - font setup failure + # - init.ly setup failure + # - parse error in .ly + # - unexpected: assert/core dump + targets = {} + + if targets.has_key ('DVI') or targets.has_key ('PS'): + try: + run_latex (files, outbase, extra) + # unless: add --tex, or --latex? + del targets['TEX'] + del targets['LATEX'] + except: + # TODO: friendly message about TeX/LaTeX setup, + # trying to run tex/latex by hand + if targets.has_key ('DVI'): + del targets['DVI'] + if targets.has_key ('PS'): + del targets['PS'] + + # TODO: does dvips ever fail? + if targets.has_key ('PS'): + run_dvips (outbase, extra) + + if outdir != '.' and (track_dependencies_p or targets.keys ()): system ('mkdir -p %s' % outdir) - - #if re.match ('.*[.]dvi', string.join (os.listdir ('.'))): - if os.path.isfile (srcname): - # huh, and what bout all other (-1, -2) scores? - system ('cp \"%s\" \"%s\"' % (srcname, dest)) - else: - dest = 0 - if re.match ('.*[.]midi', string.join (os.listdir ('.'))): - system ('cp *.midi %s' % outdir) - else: - midi = 0 - - depfile = os.path.join (outdir, base + '.dep') + # add DEP to targets? if track_dependencies_p: + depfile = os.path.join (outdir, outbase + '.dep') generate_dependency_file (depfile, dest) + if os.path.isfile (depfile): + progress (_ ("dependencies output to %s...") % depfile) + + for i in targets.keys (): + ext = string.lower (i) + if re.match ('.*[.]%s' % ext, string.join (os.listdir ('.'))): + system ('cp *.%s %s' % (ext, outdir)) + outname = outbase + '.' + string.lower (i) + abs = os.path.join (outdir, outname) + if reldir != '.': + outname = os.path.join (reldir, outname) + if os.path.isfile (abs): + progress (_ ("%s output to %s...") % (i, outname)) + elif verbose_p: + warning (_ ("can't find file: `%s'") % outname) os.chdir (original_dir) cleanup_temp () - - # most insteresting info last - # don't say silly things - if os.path.isfile (depfile): - progress (_ ("dependencies output to %s...") % depfile) - if dest and os.path.isfile (dest): - progress (_ ("%s output to %s...") % (type, dest)) - if midi and os.path.isfile (midi): - progress (_ ("%s output to %s...") % ('MIDI', midi)) + +else: + # FIXME + help () + sys.stderr.write ('\n') + try: + error (_ ("no FILEs specified, can't invoke as filter")) + except: + pass + sys.exit (2) diff --git a/scripts/update-lily.py b/scripts/update-lily.py index b683bab2ff..99e7c68cfd 100644 --- a/scripts/update-lily.py +++ b/scripts/update-lily.py @@ -50,8 +50,10 @@ patch_dir = build_root + '/patches' notify = 0 build_command = ''' +set -x cd %b && [ -d %n-%v ] && exit 1 || true; +mkdir -p %n-%v ( tar xzf %r/%t && rm -f building && @@ -243,7 +245,7 @@ option_definitions = [ ), ('', 'h', 'help', _ ("this help")), ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir), - ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]"), + ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]")), ('', 'r', 'remove-previous', _ ("remove previous build")), ('', 'V', 'verbose', _ ("verbose")), ('', 'v', 'version', _ ("print version number")), @@ -445,11 +447,11 @@ if 1: progress (_ ("building %s...") % latest) os.chdir (build_root) - if build (latest) previous and remove_previous_p: + if build (latest) and previous and remove_previous_p: system ('rm -rf %s' % os.path.join (build_root, previous)) else: if notify: - system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify) + system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify)) sys.exit (1) os.chdir (original_dir)