From 701c5e3d2e865da2a464b6460a30f14f061089ea Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 27 Feb 2001 23:18:56 +0100 Subject: [PATCH] patch::: 1.3.133.jcn1 1.3.133.jcn1 ============ * Added some part combiner doco. * Bugfix: a broken tie only generates an accidental if it would differ from an untied note. 1.3.133 ======= --- CHANGES | 11 + Documentation/user/refman.itely | 118 ++++++- Documentation/user/tricks.itely | 5 + Documentation/user/tutorial.itely | 421 ++++++++++++++++++++++++- VERSION | 2 +- input/regression/tie-accidental.ly | 69 ++-- input/tutorial/orchestral-score.ly | 36 +-- lily/local-key-engraver.cc | 18 +- lily/local-key-item.cc | 15 +- lily/midi-walker.cc | 3 + mutopia/Coriolan/c-midi.ly | 92 ++++++ mutopia/Coriolan/coriolan.ly | 68 +++- po/de.po | 104 +++--- po/fr.po | 104 +++--- po/it.po | 104 +++--- po/ja.po | 102 +++--- po/lilypond.pot | 102 +++--- po/nl.po | 102 +++--- po/ru.po | 102 +++--- stepmake/stepmake/generic-targets.make | 1 + stepmake/stepmake/po-targets.make | 2 + stepmake/stepmake/podir-targets.make | 4 + 22 files changed, 1161 insertions(+), 424 deletions(-) create mode 100644 mutopia/Coriolan/c-midi.ly diff --git a/CHANGES b/CHANGES index 0e693bb843..cae7ddb46c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +1.3.133.jcn1 +============ + +* Added some part combiner doco. + +* Bugfix: a broken tie only generates an accidental if it would differ +from an untied note. + +1.3.133 +======= + 1.3.132.jcn3 ============ diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 955435ac63..363985a0c7 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -33,6 +33,7 @@ has been revised for LilyPond 1.3.131 * Music notation:: * Polyphony:: * Spanners:: +* Ornaments:: * Repeats:: * Piano music:: * Lyrics:: @@ -452,8 +453,8 @@ This command sets @code{Staff.keySignature}. @cindex @code{keySignature} -@c . {Clef changes} -@subsubsection Clef changes +@c . {Clef} +@subsection Clef changes @cindex @code{\clef} @example \clef @var{clefname} @code{;} @@ -609,9 +610,6 @@ set different shift values. * Beam:: * Slur :: * Phrasing slur:: -* Ornaments:: -* Grace notes:: -* Bar check:: @end menu @@ -972,16 +970,18 @@ The slur syntax with parentheses is a shorthand for this. @c . {Ornaments} @node Ornaments -@subsection Ornaments +@section Ornaments @cindex Ornaments @menu * Articulation:: * Text scripts:: +* Grace notes:: +* Bar check:: @end menu @c . {Articulation} @node Articulation -@subsubsection Articulation +@subsection Articulation @cindex Articulation @cindex articulations @@ -1030,9 +1030,9 @@ name of the corresponding symbol appearing underneath. @end lilypond -@c . {Text scripts} +@c . {Text scripts} @node Text scripts -@subsubsection Text scripts +@subsection Text scripts @cindex Text scripts In addition, it is possible to place arbitrary strings of text or markup @@ -1046,7 +1046,7 @@ note ornaments appear in the printed output but have no effect on the MIDI rendering of the music. @c . {Fingerings} -@unnumberedsubsubsec Fingerings +@subsubsection Fingerings @cindex Fingerings To save typing, fingering instructions (digits 0 to 9 are @@ -2453,8 +2453,98 @@ multimeasure rest. @node Automatic part combining @subsection Automatic part combining +@cindex automatic part combining +@cindex part combiner + +You will already have seen that LilyPond can combine several Threads +into one Voice, and put several Voices onto one Staff. The automatic +part combiner takes this a step further. Two parts of music can be +combined together in an intelligent way, ie, when the two parts are +identical for a period of time, only one can be showed. In places where +the two parts differ, stem directions can be set automatically. That is +why the part combiner is of great use for the typesetting of Hymns and +orchestral scores. -[TODO] + +@subsubsection Part combine syntax + +The syntax for part combining is + +@example + \partcombine @var{context} @var{musicexpr1} @var{musicexpr2} +@end example + +where the pieces of music @var{musicexpr1} and @var{musicexpr2} will be +combined into one context @var{context}. The names of the music +expressions must start with the prefixes @code{one} and @code{two}. + +@subsubsection Part combine usage + +@cindex @code{Thread_devnull_engraver} +@cindex @code{Voice_engraver} +@cindex @code{A2_engraver} + +The most useful function of the part combiner to combining threads into +one voice, as common for wind parts in orchestral scores: + +@lilypond[verbatim,singleline,fragment] + \context Staff < + \context Voice=one \partcombine Voice + \context Thread=one \notes\relative c'' { + g a b r + } + \context Thread=two \notes\relative c'' { + g r2 f4 + } + > +@end lilypond + +If you have developed a bit of a feel for LilyPond's functioning, you +will notice that what you see above is quite unusual. The first +@code{g} appears only once, although it was specified twice (once in +each Thread). That is the work of the +@code{Thread_devnull_engraver}@footnote{On unix systems, the file +@file{/dev/null} is special device: anything written to it is +discarded.}, that works closely together with the part combiner. When +the part combiner notices that two threads are identical, it tells the +@code{Thread_devnull_engraver} to discard everything in the second +thread. + +Similarly, the markings @emph{@`{a}2}, @emph{Solo} and @emph{Solo II}, +are created by the @code{A2_engraver}. The @code{A2_engraver} also acts +upon instructions of the part combiner. Another thing that the +@code{A2_engraver} does, is forcing of stem, slur and tie directions, +always when both threads are not identical; up for the musicexpr called +@code{one}, down for the musicexpr called @code{two}. + +There is actually a third engraver involved in part combining; the +@code{Voice_devnull_engraver}. This one takes care of removing +redundant spanners such as beams, slurs, ties, crescendi, etc. + +If you just want the splitting of Threads and setting of directions, and +not the textual markings, you may set the property @var{soloADue} to false: + +@lilypond[verbatim,singleline] + \context Staff < + \context Voice=one \partcombine Voice + \context Thread=one \notes\relative c'' { + b4 a c g + } + \context Thread=two \notes\relative c'' { + d,2 a4 g' + } + > + \paper{ + \translator { + \VoiceContext + soloADue = ##f + } + } +@end lilypond + +There are a number of other properties that you can use to tweak the +behavior of part combining, refer to the automatically generated +documentation of the involved engravers and the examples in the tutorial. @c . {Custodes} @@ -3006,6 +3096,12 @@ Context definitions follow precisely the same syntax as within the \paper block. Translation modules for sound are called performers. The contexts for MIDI output are defined in @file{ly/performer.ly}. +[Volume control] +[Instrument Equaliser] + +FIXME: would it be useful to refer to files like scm/midi.scm, +or to give examples of how to tweak MIDI output volume? + @c . {MIDI instrument names} @node MIDI instrument names diff --git a/Documentation/user/tricks.itely b/Documentation/user/tricks.itely index 9e4ded359c..87381bec1f 100644 --- a/Documentation/user/tricks.itely +++ b/Documentation/user/tricks.itely @@ -271,6 +271,11 @@ Metrome hack... @node Apply hacking @section Apply hacking +[Add Parenthesed note head example?] + +[Add Smart transpose example?] + + @lilypond[verbatim] music = \notes { c'4 d'4( e'4 f'4 } diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 2160899c59..d332e0d938 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -4,13 +4,14 @@ @chapter Tutorial @menu -* Introduction:: Introduction -* Running LilyPond:: Getting started -* The first tune:: The first tune -* Lyrics and chords:: Lyrics and chords -* More movements:: More than one movement in a file -* A piano excerpt:: Piano music -* end of tutorial:: The end +* Introduction:: Introduction +* Running LilyPond:: Getting started +* The first tune:: The first tune +* Lyrics and chords:: Lyrics and chords +* More movements :: +* A piano excerpt:: Piano music +* An orchestral score:: +* end of tutorial:: The end @end menu @node Introduction @@ -1434,12 +1435,416 @@ to the page layout of this document. * font-size, cadenza. rhythmic staff, multi-stanza. +* Simple part combining in a Hymn + +@node An orchestral score +@section An orchestral score + +[ LOTS TODO * Orchestral: demonstrate Hara-Kiri, part combining, part extraction, scores, transposition, instrument names, - ] +Hopefully, you have seen enough LilyPond input examples by now to be +able read the input for a full orchestral score. We will not go through +the input line by line, but only indicate and explain the new elements. + +@lilypond[verbatim] +\version "1.3.130"; + +\include "paper13.ly"; + +% #(set! point-and-click #t) + +% Coriolan 218-222 +flautoI = \notes\relative c'' { + \property Score.currentBarNumber = #218 + des2.()c4|e(f e)f|\break + r2 des4\sf()c|r2 des4\sf()c| +} +flautoII = \notes\relative c'' { + g2.()as4|bes(as bes)as| + R1*2 +} +oboeI = \notes\relative c'' { + e2.()f4|e(f e)f| + r2 as|r as\sf| +} +oboeII = \notes\relative c'' { + g2.()as4|bes(as bes)as| + r2 as'|r as\sf| +} +clarinettoI = \notes\relative c' { + es2.()d4|c(bis c)bes| +% r2 es4\sf()d|r2 es4\sf()d| +} +clarinettoII = \notes\relative c' { + es2.()d4|c(bes c)bes| +% r2 es'4\sf()d|r2 es4\sf()d| +} +fagottoI = \notes\relative c' { + bes2.()as4|g(f g)f| + r r8 des' des4\sf()es|r r8 des des4\sf()es| +} +fagottoII = \notes\relative c' { + bes2.()as4 | g(f g)f| + f4 r r2 | f4 r r2| +} +cornoI = \notes\relative c''' { + g2. f4|g f g f| +% r4 r8 f f2|r4 r8 f f2| +} +cornoII = \notes\relative c''' { + g,2. d'4|g, d' g, d'| + r4 r8 d d4\sf()es|r4 r8 d d4\sf()es| +} +tromboI = \notes\relative c'' { + c2. c4|c c c c| + R1*2| +} +tromboII = \notes\relative c' { + c2. c4|c c c c| + R1*2| +} +timpani = \notes\relative c { + c2:16 c4 c|c c c c | + R1*2| +} +violinoI = \notes\relative c' { + des'2:16\ff des4: c:|e,: f: e: f:| + r8 as des,4\sf~des()c |r8 as' des,4\sf~des()c| +} +violinoII = \notes\relative c' { + des2:16\ff des4: c: | bes: as: bes: as:| +% r8 as des,4\sf ~ des()c| r8 as' des,4\sf ~ des()c| +} +violaI = \notes\relative c' { + e2:16\ff e4: f:|b,: c: b: c:| + r4 r8 as as2\sf|r4 r8 as as2\sf| +} +violaII = \notes\relative c' { + bes2:16\ff bes4: as:|g: f: g: f: | + r4 r8 f f4\sf()ges|r4 r8 f f4\sf()ges| +} +violoncello = \notes\relative c { + bes2.\ff()as4|g( f g )f | + r4 r8 f' f4\sf()ges |r4 r8 f f4\sf()ges | +} +contrabasso = \notes\relative c { + bes2.\ff()as4|g( f g )f| + f4 r r2 |f'4 r r2| +} + +#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) + +staffCombinePianoStaffProperties = { + \property PianoStaff.devNullThread = #'() + \property PianoStaff.soloADue = ##t + \property PianoStaff.soloText = #"" + \property PianoStaff.soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property PianoStaff.aDueText = #"\\`a2" + \property PianoStaff.splitInterval = #'(1 . 0) + \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + \property PianoStaff.noDirection = ##t +} + +%% +%% Hmm, can't we move this to a `template.ly' +%% +\score { + < + \context StaffGroup = wood < + \context Staff = flauti < + \property Staff.midiInstrument = #"flute" + \property Staff.instrument = "2 Flauti" + \property Staff.instr = "Fl." + \context Voice=one \partcombine Voice + \context Thread=one \flautoI + \context Thread=two \flautoII + > + \context Staff = oboes < + \property Staff.midiInstrument = #"oboe" + \property Staff.instrument = "2 Oboi" + \property Staff.instr = "Ob." + \context Voice=one \partcombine Voice + \context Thread=one \oboeI + \context Thread=two \oboeII + > + \context Staff = clarinets < + \property Staff.midiInstrument = #"clarinet" + \property Staff.instrument = #`(lines + "2 Clarinetti" (rows "(B" ,text-flat ")")) + \property Staff.instr = #`(lines + "Cl." (rows "(B" ,text-flat ")")) + \property Staff.transposing = #-2 + \notes \key f \major; + \context Voice=one \partcombine Voice + \context Thread=one \clarinettoI + \context Thread=two \clarinettoII + > + \context Staff = bassoons < + \property Staff.midiInstrument = #"bassoon" + \property Staff.instrument = "2 Fagotti" + \property Staff.instr = "Fg." + \clef bass; + \context Voice=one \partcombine Voice + \context Thread=one \fagottoI + \context Thread=two \fagottoII + > + > + \context StaffGroup = brass < + \context Staff = frenchHorns < + \property Staff.midiInstrument = #"french horn" + \property Staff.instrument = #`(lines + "2 Corni" (rows "(E" ,text-flat ")")) + \property Staff.instr = #`(lines + "Cor." (rows "(E" ,text-flat ")")) + \property Staff.transposing = #3 + \notes \key c \major; + \context Voice=one \partcombine Voice + \context Thread=one \cornoI + \context Thread=two \cornoII + > + \context Staff = trumpets < + \property Staff.midiInstrument = #"trumpet" + \property Staff.instrument = #`(lines + "2 Trombe" (rows "(C)")) + \property Staff.instr = #`(lines + "Tbe." (rows "(C)")) + \context Voice=one \partcombine Voice + \context Thread=one \tromboI + \context Thread=two \tromboII + > + > + \context StaffGroup = timpani < + \context Staff = timpani < + \property Staff.midiInstrument = #"timpani" + \property Staff.instrument = #'(lines + "2 Timpani" "(C-G)") + \property Staff.instr = #"Timp." + \clef bass; + \timpani + > + > + \context StaffGroup = strings < + \context GrandStaff = violins < + \context Staff = viI < + \property Staff.midiInstrument = #"violin" + \property Staff.instrument = "Violino I" + \property Staff.instr = "Vi. I" + \violinoI + > + \context Staff = viII < + \property Staff.midiInstrument = #"violin" + \property Staff.instrument = "Violino II" + \property Staff.instr = "Vi. II" + \violinoII + > + > + \context Staff = vla < + \property Staff.midiInstrument = #"viola" + \property Staff.instrument = "Viola" + \property Staff.instr = "Vla." + \clef alto; + \context Voice=one \partcombine Voice + \context Thread=one \violaI + \context Thread=two \violaII + > + \context PianoStaff=bass < + \staffCombinePianoStaffProperties + \context Staff=one < + \property Staff.midiInstrument = #"cello" + \property Staff.instrument = #'(lines + "Violoncello" " e" "Contrabasso") + \property Staff.instr = "Vc." + \clef bass; + > + \context Staff=two < + \property Staff.midiInstrument = #"contrabass" + \property Staff.instrument = "Contrabasso" + \property Staff.instr = "C.B." + \clef bass; + \skip 1*4; % sustain clef + > + \context Staff=one \partcombine Staff + \context Voice=one \violoncello + \context Voice=two \contrabasso + > + > + > + \paper { + \paperThirteen + linewidth = 80 * \staffspace; + textheight = 200 * \staffspace; + \translator{ + \ThreadContext + \consists "Rest_engraver"; + + % Set value for engraver at thread level, + % to override the default that is set in ScoreContext + % for added engraver at Voice level + devNullThread = #'() + } + \translator{ + \VoiceContext + \remove "Rest_engraver"; + + % The staff combine (bassi part) needs a + % thread_devnull_engraver here. + % Instead of maintaining two separate hierarchies, + % we switch add it, but switch it off immediately. + % --> move to Score level to be able to override + % The staff combine part switches it on. + + %% devNullThread = #'never + \consists "Thread_devnull_engraver"; + } + \translator{ + \HaraKiriStaffContext + \consists "Mark_engraver"; + } + \translator { + \OrchestralScoreContext + % skipBars = ##t + + soloText = #"I." + soloIIText = #"II." + % By default, turn off the Thread_devnull_engraver + % at Voice level + devNullThread = #'never + + % Hmm + currentBarNumber = #218 + BarNumber \override #'padding = #3 + RestCollision \override #'maximum-rest-count = #1 + TimeSignature \override #'style = #'C + } + } +} +@end lilypond + +Ok, so explain: + +@example +% #(set! point-and-click #t) +@end example + +@example +#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) +@end example + +@example +staffCombinePianoStaffProperties = @{ +@end example + +@example +% Coriolan 218-222 +@end example + +@example +flautoI = \notes\relative c'' @{ +@end example + +@example + \property Score.currentBarNumber = #218 +@end example + +@example +flautoII = \notes\relative c'' @{ +@end example + +[skip] + + +The hairyness of Staff combining + +@example + \property PianoStaff.devNullThread = #'() +@end example + +@example + \property PianoStaff.soloADue = ##t +@end example + +@example + \property PianoStaff.soloText = #"" + \property PianoStaff.soloIIText = #"" +@end example + +@example + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property PianoStaff.aDueText = #"\\`a2" +@end example + +@example + \property PianoStaff.splitInterval = #'(1 . 0) + \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) +@end example + +@example + \property PianoStaff.noDirection = ##t +@end example + + +@example +\score @{ + < +@end example + +@example + \context StaffGroup = wood < +@end example + +@example + \context Staff = flauti < +@end example + +@example + \property Staff.midiInstrument = #"flute" +@end example + +@example + \property Staff.instrument = "2 Flauti" + \property Staff.instr = "Fl." +@end example + +@example + \context Voice=one \partcombine Voice + \context Thread=one \flautoI + \context Thread=two \flautoII + > +@end example + +[skip] + +@example + \property Staff.instrument = #`(lines + "2 Clarinetti" (rows "(B" ,text-flat ")")) +@end example + +@example + \property Staff.instr = #`(lines + "Cl." (rows "(B" ,text-flat ")")) +@end example + +@example + \property Staff.transposing = #-2 +@end example + +@example + \notes \key f \major; +@end example + +@example +@end example + +[the syntax of staff combining] +[the paper block] + @node end of tutorial @section The end diff --git a/VERSION b/VERSION index 39268623d4..922f0005d0 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=133 -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/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index 8faf34ab8f..d332e20b10 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -1,37 +1,54 @@ \header{ texidoc=" -When tieing notes with accidentals across a bar boundary, the accidental -must not be drawn on the note in the new bar. Instead, the next note of -the same pitch in this bar should always show the accidental (even if -it's natural). Slurring a accidentaled note to a natural one across bar +When tieing notes with accidentals across a bar boundary, the +accidental must not be drawn on the note in the next bar. Unless the +tie crosses a line break, in which case the accidental is repeated if +it would be different from an untied note. The next note of the same +pitch in this next bar should always show the accidental (even if it's +natural). Slurring a accidentaled note to a natural one across bar boundaries should be explicit. Pitches can be verified by printing them with the @code{NoteNames} context. "; } -thenotes = \notes \relative cis' { \time 4/4; -g'2 g ~ | -g g4 gis | -gis2 gis ~ | -gis4 gis8 ~ gis g4 gis | -g2 gis ~ | -gis g4 gis | -g2 gis( | -)g! gis4 gis | -\break -\key a \major; -gis2 gis ~ | -gis4 gis8 ~ gis g4 gis | -gis2 g ~ | -g4 gis8 ~ gis g4 gis | -g2 gis ~ | -gis g4 gis | -g2 gis( | -)g! gis4 gis | +thenotes = \notes \relative cis' { + \time 4/4; + g'2 g ~ | + g g4 gis | + gis2 gis ~ | + gis4 gis8 ~ gis g4 gis | + g2 gis ~ | + gis g4 gis | + g2 gis( | + )g! gis4 gis | + \break + \key a \major; + gis2 gis ~ | + gis4 gis8 ~ gis g4 gis | + gis2 g ~ | + g4 gis8 ~ gis g4 gis | + g2 gis ~ | + gis g4 gis | + g2 gis( | + + % FIXME: check for accidentals at line break could look more cute + % maybe move to tie-break-accidental? + + % Btw: I don't even know what the rule is for the second note in the + % next bar, if a reminder accidental was printed. These are really + % not very common cases. Technically, if it is not tied, it + % should get an accidental; but it looks a bit silly and redundant. + % See last g. + + )g! gis4 gis ~ | \break + gis2 gis ~ | gis g ~\break + g2 g } -\score { < \context Staff \thenotes - \context NoteNames \thenotes - > +\score { + < + \context Staff \thenotes + \context NoteNames \thenotes + > } diff --git a/input/tutorial/orchestral-score.ly b/input/tutorial/orchestral-score.ly index 30e0dd2087..58a188dbaa 100644 --- a/input/tutorial/orchestral-score.ly +++ b/input/tutorial/orchestral-score.ly @@ -1,22 +1,8 @@ \version "1.3.130"; -\include "paper16.ly"; +\include "paper13.ly"; % #(set! point-and-click #t) -#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) - -staffCombinePianoStaffProperties = { - \property PianoStaff.devNullThread = #'() - \property PianoStaff.soloADue = ##t - \property PianoStaff.soloText = #"" - \property PianoStaff.soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - \property PianoStaff.aDueText = #"\\`a2" - \property PianoStaff.splitInterval = #'(1 . 0) - \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) - \property PianoStaff.noDirection = ##t -} % Coriolan 218-222 flautoI = \notes\relative c'' { @@ -98,6 +84,20 @@ contrabasso = \notes\relative c { } +#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) + +staffCombinePianoStaffProperties = { + \property PianoStaff.devNullThread = #'() + \property PianoStaff.soloADue = ##t + \property PianoStaff.soloText = #"" + \property PianoStaff.soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property PianoStaff.aDueText = #"\\`a2" + \property PianoStaff.splitInterval = #'(1 . 0) + \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + \property PianoStaff.noDirection = ##t +} %% %% Hmm, can't we move this to a `template.ly' @@ -144,7 +144,7 @@ contrabasso = \notes\relative c { > > \context StaffGroup = brass < - \context Staff = frenshHorns < + \context Staff = frenchHorns < \property Staff.midiInstrument = #"french horn" \property Staff.instrument = #`(lines "2 Corni" (rows "(E" ,text-flat ")")) @@ -157,7 +157,7 @@ contrabasso = \notes\relative c { \context Thread=two \cornoII > \context Staff = trumpets < - \property Staff.midiInstrument = #"clarinet" + \property Staff.midiInstrument = #"trumpet" \property Staff.instrument = #`(lines "2 Trombe" (rows "(C)")) \property Staff.instr = #`(lines @@ -224,7 +224,7 @@ contrabasso = \notes\relative c { > > \paper { - \paperSixteen + \paperThirteen linewidth = 80 * \staffspace; textheight = 200 * \staffspace; \translator{ diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index fe1ee8b0d7..8055431713 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -98,16 +98,20 @@ Local_key_engraver::create_grobs () bool different = !gh_equal_p(prev_acc , gh_int2scm(a)); int p = gh_number_p(prev_acc) ? gh_scm2int(prev_acc) : 0; - Grob *tie_break_cautionary = 0; + Grob *tie_break_reminder = 0; bool tie_changes = false; for (int i=0; i < tie_l_arr_.size (); i++) if (support_l == Tie::head (tie_l_arr_[i], RIGHT)) { tie_changes = different; -#if 1 - /* Enable accidentals for broken tie */ - tie_break_cautionary = tie_l_arr_[i]; -#endif + /* Enable accidentals for broken tie + + We only want an accidental on a broken tie, + if the tie changes the accidental. + + Maybe check property noTieBreakForceAccidental? */ + if (different) + tie_break_reminder = tie_l_arr_[i]; break; } @@ -121,7 +125,7 @@ Local_key_engraver::create_grobs () if (((to_boolean (note_l->get_mus_property ("force-accidental")) || different) && !tie_changes) - || tie_break_cautionary) + || tie_break_reminder) { if (!key_item_p_) { @@ -142,7 +146,7 @@ Local_key_engraver::create_grobs () Local_key_item::add_pitch (key_item_p_, *unsmob_pitch (note_l->get_mus_property ("pitch")), to_boolean (note_l->get_mus_property ("cautionary")), extra_natural, - tie_break_cautionary); + tie_break_reminder); Side_position::add_support (key_item_p_,support_l); } diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 700535e015..03434be4a2 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -69,11 +69,14 @@ Local_key_item::parenthesize (Grob*me, Molecule m) return m; } -/* - HW says: move to tie.cc +/* HW says: maybe move to tie.cc + + Note, tie should not kill all accidentals when broken, only the ones + that are indicated by a property tie-break-reminder, I guess - Ugh: this doesn't work: brew_molecule is called before line-breaking - */ + Find if any of the accidentals were created because they're at the rhs of a + tie. If that's the reason they exist, and the tie was NOT broken, + put the accidental up for deletion. Clear molecule cache. */ MAKE_SCHEME_CALLBACK (Local_key_item, after_line_breaking, 1); SCM Local_key_item::after_line_breaking (SCM smob) @@ -86,14 +89,14 @@ Local_key_item::after_line_breaking (SCM smob) { SCM opts = gh_cdar (s); - SCM t = scm_memq (ly_symbol2scm ("tie-break-cautionary"), opts); + SCM t = scm_memq (ly_symbol2scm ("tie-break-reminder"), opts); if (t != SCM_BOOL_F) { Grob *tie = unsmob_grob (gh_cadr (t)); Spanner *sp = dynamic_cast (tie); if (!sp->original_l_) { - /* there should be a better way to delete me */ + /* there should be a better way to delete part of me */ scm_set_car_x (s, gh_list (gh_caar (s), ly_symbol2scm ("deleted"), SCM_UNDEFINED)); diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 986a58ebdb..fe67eaf0fa 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -60,9 +60,12 @@ Midi_walker::do_start_note (Midi_note* note_p) /* let stopnote in queue be ignored, new stop note wins */ stop_note_queue[i].ignore_b_ = true; + +#if 0 // Ugh: this fixes stuck notes bug, but breaks most everything else? /* don't replay start note, */ play_start = false; break; +#endif } else { diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly new file mode 100644 index 0000000000..ca461d2371 --- /dev/null +++ b/mutopia/Coriolan/c-midi.ly @@ -0,0 +1,92 @@ + +%% +%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. +%% + +\version "1.3.117"; + +\include "header.ly" +\include "global.ly" + +\include "flauto-1.ly" +\include "flauto-2.ly" +\include "oboe-1.ly" +\include "oboe-2.ly" +\include "clarinetto-1.ly" +\include "clarinetto-2.ly" +\include "fagotto-1.ly" +\include "fagotto-2.ly" +\include "corno-1.ly" +\include "corno-2.ly" +\include "trombo-1.ly" +\include "trombo-2.ly" +\include "timpani.ly" +\include "violino-1.ly" +\include "violino-2.ly" +\include "viola-1.ly" +\include "viola-2.ly" +\include "violoncello.ly" +\include "contrabasso.ly" + +\score{ + < + \global + \context Staff=flauti < + \property Staff.midiInstrument = #"flute" + \flautoI + \flautoII + > + \context Staff=oboi < + \property Staff.midiInstrument = #"oboe" + \oboeI + \oboeII + > + \context Staff=clarinetti < + \property Staff.midiInstrument = #"clarinet" + \property Staff.transposing = #-2 + \clarinettoI + \clarinettoII + > + \context Staff=fagotti < + \property Staff.midiInstrument = #"bassoon" + \fagottoI + \fagottoII + > + \context Staff=corni < + \property Staff.midiInstrument = #"french horn" + \property Staff.transposing = #3 + \cornoI + \cornoII + > + \context Staff=trombe < + \property Staff.midiInstrument = #"trumpet" + \tromboI + \tromboII + > + \context Staff=timpani < + \property Staff.midiInstrument = #"timpani" + \timpani + > + \context Staff=violini < + \property Staff.midiInstrument = #"violin" + \violinoI + \violinoII + > + \context Staff=violi < + \property Staff.midiInstrument = #"viola" + \violaI + \violaII + > + \context Staff=violoncello < + \property Staff.midiInstrument = #"cello" + \violoncello + > + \context Staff=contrabasso < + \property Staff.midiInstrument = #"contrabass" + \property Staff.transposing = #-12 + \contrabasso + > + > + \include "coriolan-midi.ly" +} + diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 76a551b9e2..d3a9333039 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -62,6 +62,72 @@ archiGroup = \context StaffGroup = archi_group < instrument = ""; } \include "coriolan-paper.ly" - \include "coriolan-midi.ly" +% \include "coriolan-midi.ly" } + + +%% +%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. +%% +\score{ + < + \global + \context Staff=flauti < + \property Staff.midiInstrument = #"flute" + \flautoI + \flautoII + > + \context Staff=oboi < + \property Staff.midiInstrument = #"oboe" + \oboeI + \oboeII + > + \context Staff=clarinetti < + \property Staff.midiInstrument = #"clarinet" + \property Staff.transposing = #-2 + \clarinettoI + \clarinettoII + > + \context Staff=fagotti < + \property Staff.midiInstrument = #"bassoon" + \fagottoI + \fagottoII + > + \context Staff=corni < + \property Staff.midiInstrument = #"french horn" + \property Staff.transposing = #3 + \cornoI + \cornoII + > + \context Staff=trombe < + \property Staff.midiInstrument = #"trumpet" + \tromboI + \tromboII + > + \context Staff=timpani < + \property Staff.midiInstrument = #"timpani" + \timpani + > + \context Staff=violini < + \property Staff.midiInstrument = #"violin" + \violinoI + \violinoII + > + \context Staff=violi < + \property Staff.midiInstrument = #"viola" + \violaI + \violaII + > + \context Staff=violoncello < + \property Staff.midiInstrument = #"cello" + \violoncello + > + \context Staff=contrabasso < + \property Staff.midiInstrument = #"contrabass" + \property Staff.transposing = #-12 + \contrabasso + > + > + \include "coriolan-midi.ly" +} diff --git a/po/de.po b/po/de.po index c261683547..ef69888cff 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-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -63,8 +63,8 @@ msgstr "Position unbekannt" msgid "can't map file" msgstr "Kann die Datei nicht mappen" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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" @@ -185,7 +185,7 @@ msgstr "Notenhals passt nicht in den Balken" msgid "beam was started here" msgstr "Der Balken bagann hier" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "unbekannter Übersetzer `%s'" @@ -247,22 +247,22 @@ msgstr "Kann die Speicher msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 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:219 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" @@ -353,102 +353,106 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:105 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "Diese Hilfe" -#: main.cc:107 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "DIR" -#: main.cc:108 +#: main.cc:111 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:98 main.cc:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "DATEI" -#: main.cc:109 +#: main.cc:112 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:110 +#: main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:112 +#: main.cc:115 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: main.cc:113 +#: main.cc:116 #, fuzzy msgid "NAME" msgstr "BASENAME" -#: main.cc:113 +#: main.cc:116 #, fuzzy msgid "write output to NAME" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: main.cc:114 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" -#: main.cc:103 main.cc:115 +#: main.cc:103 main.cc:118 msgid "don't timestamp the output" msgstr "Keine Datumsangabe auf der Ausgabe" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: main.cc:117 +#: main.cc:120 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:137 +#: main.cc:141 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:141 +#: main.cc:145 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" @@ -458,20 +462,20 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "Optionen:" -#: main.cc:151 +#: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -484,17 +488,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:195 +#: main.cc:199 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -524,29 +528,24 @@ msgstr "" "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n" "USA.\n" -#: midi-item.cc:311 +#: midi-item.cc:312 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Kein solches instrument: `%s'" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "Ungewöhnliche Tonart: Bes: %d, Kreuze: %d" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "Unsinnige Dauer" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "unsinnige Tonhöhe" -#: midi-stream.cc:29 paper-stream.cc:50 -#, fuzzy -msgid "Error syncing file (disk full?)" -msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" - #: musical-request.cc:29 #, fuzzy, c-format msgid "Transposition by %s makes accidental larger than two" @@ -621,6 +620,11 @@ msgstr "Gebe Partitur aus, definiert bei: " msgid "can't create directory: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" +#: paper-stream.cc:50 +#, fuzzy +msgid "Error syncing file (disk full?)" +msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -650,7 +654,7 @@ msgstr "Erstellt von: " msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." @@ -777,7 +781,7 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "" @@ -811,11 +815,11 @@ msgstr "TFM header von `%s' hat nur %u Wort(e)" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "Es wurden keine Haltebögen erzeugt!" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "Einsamer Haltebogen" diff --git a/po/fr.po b/po/fr.po index 574266208d..9e1073e11d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" @@ -63,8 +63,8 @@ msgstr "position inconnue" msgid "can't map file" msgstr "impossible de mapper le fichier" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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'" @@ -185,7 +185,7 @@ msgstr "la tige ne rentre pas dans la barre" msgid "beam was started here" msgstr "la barre a commencé ici" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "traducteur inconnu `%s'" @@ -246,22 +246,22 @@ msgstr "impossible de positionner mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 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:219 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a crescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminé" @@ -349,99 +349,103 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "cette aide" -#: main.cc:107 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "REP" -#: main.cc:108 +#: main.cc:111 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:98 main.cc:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "FICHIER" -#: main.cc:109 +#: main.cc:112 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:110 +#: main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:112 +#: main.cc:115 #, fuzzy msgid "produce MIDI output only" msgstr "produit seulement la sortie MIDI" -#: main.cc:113 +#: main.cc:116 msgid "NAME" msgstr "" -#: main.cc:113 +#: main.cc:116 msgid "write output to NAME" msgstr "" -#: main.cc:114 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:103 main.cc:115 +#: main.cc:103 main.cc:118 msgid "don't timestamp the output" msgstr "" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "afficher le numéro de version" -#: main.cc:117 +#: main.cc:120 msgid "verbose" msgstr "" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 msgid "show warranty and copyright" msgstr "" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:137 +#: main.cc:141 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:141 +#: main.cc:145 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -452,21 +456,21 @@ msgstr "" "paritions à partir de description de gaut niveau en entrée. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "Options: " -#: main.cc:151 +#: main.cc:155 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "Cet exécutable a été compilé avec les options suivantes:" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs à" -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -474,17 +478,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:195 +#: main.cc:199 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -501,29 +505,24 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:311 +#: midi-item.cc:312 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "Pas d'instrument tel: `%s'" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "" -#: midi-stream.cc:29 paper-stream.cc:50 -#, fuzzy -msgid "Error syncing file (disk full?)" -msgstr ")" - #: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" @@ -596,6 +595,11 @@ msgstr "" msgid "can't create directory: `%s'" msgstr "ne peut pas trouver ou créer `%s'" +#: paper-stream.cc:50 +#, fuzzy +msgid "Error syncing file (disk full?)" +msgstr ")" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -626,7 +630,7 @@ msgstr "Auteur: " msgid "from musical definition: %s" msgstr "" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "" @@ -745,7 +749,7 @@ msgstr "d msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "" @@ -779,11 +783,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "Aucune liaison n'a été crée" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "liaison solitaire" diff --git a/po/it.po b/po/it.po index 30007b91f1..efccc58a17 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -63,8 +63,8 @@ msgstr "posizione sconosciuta" msgid "can't map file" msgstr "non posso mappare il documento" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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'" @@ -181,7 +181,7 @@ msgstr "il gambo non rientra nel beam" msgid "beam was started here" msgstr "" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "traduttore sconosciuto `%s'" @@ -243,22 +243,22 @@ msgstr "non posso settare mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 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:219 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" @@ -347,129 +347,133 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "" -#: main.cc:107 +#: main.cc:110 msgid "FIELD" msgstr "" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "" -#: main.cc:108 +#: 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:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "" -#: main.cc:109 +#: 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:113 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:112 +#: main.cc:115 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: main.cc:113 +#: main.cc:116 msgid "NAME" msgstr "" -#: main.cc:113 +#: main.cc:116 msgid "write output to NAME" msgstr "" -#: main.cc:114 +#: main.cc:117 #, 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:103 main.cc:115 +#: main.cc:103 main.cc:118 #, fuzzy msgid "don't timestamp the output" msgstr "" " -T, --no-timestamps non inserisce marcatori temporali nell'output\n" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "" -#: main.cc:117 +#: main.cc:120 msgid "verbose" msgstr "" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:137 +#: main.cc:141 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:141 +#: main.cc:145 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:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "Opzioni: " -#: main.cc:151 +#: main.cc:155 #, fuzzy msgid "This binary was compiled with the following options:" msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -477,17 +481,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:195 +#: main.cc:199 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -519,29 +523,24 @@ msgstr "" "Cambridge, MA 02136\n" "USA.\n" -#: midi-item.cc:311 +#: midi-item.cc:312 #, fuzzy, c-format msgid "no such instrument: `%s'" msgstr "% strumento:" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "armatura non convenzionale: %d bemolli e %d diesis" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "indicazione durata priva di senso" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "indicazione altezza priva di senso" -#: midi-stream.cc:29 paper-stream.cc:50 -#, fuzzy -msgid "Error syncing file (disk full?)" -msgstr "errore nel sincronizzare il file (disco pieno?)" - #: musical-request.cc:29 #, fuzzy, c-format msgid "Transposition by %s makes accidental larger than two" @@ -616,6 +615,11 @@ msgstr "emetto lo Score, definito a: " msgid "can't create directory: `%s'" msgstr "non trovo e non posso creare `%s'" +#: paper-stream.cc:50 +#, fuzzy +msgid "Error syncing file (disk full?)" +msgstr "errore nel sincronizzare il file (disco pieno?)" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -646,7 +650,7 @@ msgstr "Autore: " msgid "from musical definition: %s" msgstr "della definizione musicale: %s" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." @@ -771,7 +775,7 @@ msgstr "dimensione del gambo poco ortodossa; check for narrow beams" msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "" @@ -805,11 +809,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "" diff --git a/po/ja.po b/po/ja.po index 2c69202163..9bc039b338 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-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -63,8 +63,8 @@ msgstr " msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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'" @@ -183,7 +183,7 @@ msgstr " msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'" @@ -244,22 +244,22 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:219 +#: dynamic-engraver.cc:223 #, fuzzy msgid "already have a crescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 #, fuzzy msgid "already have a decrescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 #, fuzzy msgid "unterminated (de)crescendo" msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" @@ -346,100 +346,104 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:105 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: main.cc:107 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "DIR" -#: main.cc:108 +#: main.cc:111 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:98 main.cc:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "FILE" -#: main.cc:109 +#: main.cc:112 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:110 +#: main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:112 +#: main.cc:115 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: main.cc:113 +#: main.cc:116 #, fuzzy msgid "NAME" msgstr "BASENAME" -#: main.cc:113 +#: main.cc:116 #, fuzzy msgid "write output to NAME" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: main.cc:114 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" -#: main.cc:103 main.cc:115 +#: main.cc:103 main.cc:118 msgid "don't timestamp the output" msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: main.cc:117 +#: main.cc:120 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:137 +#: main.cc:141 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:141 +#: main.cc:145 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" @@ -449,20 +453,20 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU " "¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" -#: main.cc:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: main.cc:151 +#: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -478,17 +482,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:195 +#: main.cc:199 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -535,28 +539,24 @@ msgstr "" "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n" "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: midi-item.cc:311 +#: midi-item.cc:312 #, c-format msgid "no such instrument: `%s'" msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "´·½¬¤Ë¹ç¤ï¤Ê¤¤¥­¡¼¤Ç¤¹: ¥Õ¥é¥Ã¥È: %d ¸Ä, ¥·¥ã¡¼¥× %d ¸Ä" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "Çϼ¯¤²¤¿²»Ä¹" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" -#: midi-stream.cc:29 paper-stream.cc:50 -msgid "Error syncing file (disk full?)" -msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" - #: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" @@ -629,6 +629,10 @@ msgstr " msgid "can't create directory: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" +#: paper-stream.cc:50 +msgid "Error syncing file (disk full?)" +msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -658,7 +662,7 @@ msgstr " msgid "from musical definition: %s" msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" @@ -777,7 +781,7 @@ msgstr " msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "" @@ -811,11 +815,11 @@ msgstr "`%s' msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤" diff --git a/po/lilypond.pot b/po/lilypond.pot index d2b4ff2d0f..52ed8d32de 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-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,8 +62,8 @@ msgstr "" msgid "can't map file" msgstr "" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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 "" @@ -176,7 +176,7 @@ msgstr "" msgid "beam was started here" msgstr "" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "" @@ -234,19 +234,19 @@ msgstr "" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:219 +#: dynamic-engraver.cc:223 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "" @@ -331,115 +331,119 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "" -#: main.cc:107 +#: main.cc:110 msgid "FIELD" msgstr "" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "" -#: main.cc:108 +#: main.cc:111 msgid "add DIR to search path" msgstr "" -#: main.cc:98 main.cc:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "" -#: main.cc:109 +#: main.cc:112 msgid "use FILE as init file" msgstr "" -#: main.cc:110 +#: main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:112 +#: main.cc:115 msgid "produce MIDI output only" msgstr "" -#: main.cc:113 +#: main.cc:116 msgid "NAME" msgstr "" -#: main.cc:113 +#: main.cc:116 msgid "write output to NAME" msgstr "" -#: main.cc:114 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:103 main.cc:115 +#: main.cc:103 main.cc:118 msgid "don't timestamp the output" msgstr "" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "" -#: main.cc:117 +#: main.cc:120 msgid "verbose" msgstr "" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 msgid "show warranty and copyright" msgstr "" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:137 +#: main.cc:141 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:141 +#: main.cc:145 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:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "" -#: main.cc:151 +#: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -447,16 +451,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:195 +#: main.cc:199 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -473,28 +477,24 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:311 +#: midi-item.cc:312 #, c-format msgid "no such instrument: `%s'" msgstr "" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "" -#: midi-stream.cc:29 paper-stream.cc:50 -msgid "Error syncing file (disk full?)" -msgstr "" - #: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" @@ -567,6 +567,10 @@ msgstr "" msgid "can't create directory: `%s'" msgstr "" +#: paper-stream.cc:50 +msgid "Error syncing file (disk full?)" +msgstr "" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -596,7 +600,7 @@ msgstr "" msgid "from musical definition: %s" msgstr "" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "" @@ -711,7 +715,7 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "" @@ -742,11 +746,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "" diff --git a/po/nl.po b/po/nl.po index 4b7e5f06d1..e660605c45 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-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "PO-Revision-Date: 2000-06-09 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -72,8 +72,8 @@ msgstr "positie onbekend" msgid "can't map file" msgstr "kan bestand niet inkaarten" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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'" @@ -188,7 +188,7 @@ msgstr "stok past niet in waardestreep" msgid "beam was started here" msgstr "waardestreep werd hier gestart" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "onbekend ruimte paar `%s', `%s'" @@ -246,19 +246,19 @@ msgstr "kan geheugen controle niet zetten!" msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:219 +#: dynamic-engraver.cc:223 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" @@ -345,95 +345,99 @@ msgstr "liedteksten gevonden zonder bijbehorend nootbolletje" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Huh? Melismatische noot blijkt bijbehorende liedtekst te hebben." -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "EXT" -#: main.cc:105 +#: 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:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "deze hulp" -#: main.cc:107 +#: main.cc:110 msgid "FIELD" msgstr "VELD" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "DIR" -#: main.cc:108 +#: main.cc:111 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:98 main.cc:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "BESTAND" -#: main.cc:109 +#: main.cc:112 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:110 +#: main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "voeg DIR voor aan afhankelijkheden" -#: main.cc:112 +#: main.cc:115 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: main.cc:113 +#: main.cc:116 msgid "NAME" msgstr "NAAM" -#: main.cc:113 +#: main.cc:116 msgid "write output to NAME" msgstr "schrijf uitvoer naar NAAM" -#: main.cc:114 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "verbied naamgeving van uitvoer bestand en exportering" -#: main.cc:103 main.cc:115 +#: main.cc:103 main.cc:118 msgid "don't timestamp the output" msgstr "geen tijdsstempel in de uitvoer" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "druk versienummer af" -#: main.cc:117 +#: main.cc:120 msgid "verbose" msgstr "breedsprakig" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "schrijf midi uitvoer in geformatteerd ascii" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:137 +#: main.cc:141 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:141 +#: main.cc:145 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" @@ -443,22 +447,22 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "Opties:" -#: main.cc:151 +#: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "Dit programma is gecompileerd met de volgende instellingen:" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -470,16 +474,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:195 +#: main.cc:199 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -509,28 +513,24 @@ msgstr "" "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n" "675 Mass Ave, Cambridge, MA 02139, USA.\n" -#: midi-item.cc:311 +#: midi-item.cc:312 #, c-format msgid "no such instrument: `%s'" msgstr "geen dergelijk instrument: `%s'" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "vreemde toonsoort: %d mollen, %d kruizen" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "rare duur" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "rare toonhoogte" -#: midi-stream.cc:29 paper-stream.cc:50 -msgid "Error syncing file (disk full?)" -msgstr "Fout by synchroniseren van bestand (disk vol?)" - #: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" @@ -603,6 +603,10 @@ msgstr "Uitvoer van Score, gedefinieerd op: " msgid "can't create directory: `%s'" msgstr "kan directory niet scheppen: `%s'" +#: paper-stream.cc:50 +msgid "Error syncing file (disk full?)" +msgstr "Fout by synchroniseren van bestand (disk vol?)" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -632,7 +636,7 @@ msgstr "Schepper: " msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." @@ -749,7 +753,7 @@ msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "Text_spanner te klein" @@ -781,11 +785,11 @@ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "Geen overbindingen geschapen!" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "eenzame overbinding" diff --git a/po/ru.po b/po/ru.po index acdd915656..1356b83cd7 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-02-24 12:58+0100\n" +"POT-Creation-Date: 2001-02-27 21:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -62,8 +62,8 @@ msgstr " msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" -#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111 -#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 +#: mapped-file-storage.cc:87 mudela-stream.cc:111 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'" @@ -176,7 +176,7 @@ msgstr " msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: break-align-item.cc:131 +#: break-align-item.cc:136 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ ÂÕÍÁÇÉ: `%s'" @@ -235,19 +235,19 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:219 +#: dynamic-engraver.cc:223 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:224 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:303 +#: dynamic-engraver.cc:307 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" @@ -333,100 +333,104 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:105 +#: main.cc:108 msgid "EXT" msgstr "òáóû" -#: main.cc:105 +#: main.cc:108 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:95 main.cc:106 +#: main.cc:95 main.cc:109 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: main.cc:107 +#: main.cc:110 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:107 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:108 main.cc:111 +#: main.cc:111 main.cc:114 msgid "DIR" msgstr "ëáô" -#: main.cc:108 +#: main.cc:111 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:98 main.cc:109 +#: main.cc:98 main.cc:112 msgid "FILE" msgstr "æáêì" -#: main.cc:109 +#: main.cc:112 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:110 +#: main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: main.cc:111 +#: main.cc:114 msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:112 +#: main.cc:115 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: main.cc:113 +#: main.cc:116 #, fuzzy msgid "NAME" msgstr "ïóîï÷á" -#: main.cc:113 +#: main.cc:116 #, fuzzy msgid "write output to NAME" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: main.cc:114 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" -#: main.cc:103 main.cc:115 +#: main.cc:103 main.cc:118 msgid "don't timestamp the output" msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ" -#: main.cc:104 main.cc:116 +#: main.cc:104 main.cc:119 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: main.cc:117 +#: main.cc:120 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: main.cc:106 main.cc:118 +#: main.cc:106 main.cc:121 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" +#: main.cc:122 +msgid "write midi ouput in formatted ascii" +msgstr "" + #. #. No version number or newline here. It confuses help2man #. -#: main.cc:135 +#: main.cc:139 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:137 +#: main.cc:141 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:141 +#: main.cc:145 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" @@ -436,20 +440,20 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:119 main.cc:147 +#: main.cc:119 main.cc:151 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: main.cc:151 +#: main.cc:155 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:123 main.cc:170 +#: main.cc:123 main.cc:174 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: main.cc:55 main.cc:178 +#: main.cc:55 main.cc:182 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -461,17 +465,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:62 main.cc:185 main.cc:197 +#: main.cc:62 main.cc:189 main.cc:201 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:195 +#: main.cc:199 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:71 main.cc:203 +#: main.cc:71 main.cc:207 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" @@ -488,28 +492,24 @@ msgid "" "USA.\n" msgstr "" -#: midi-item.cc:311 +#: midi-item.cc:312 #, c-format msgid "no such instrument: `%s'" msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" -#: midi-item.cc:366 +#: midi-item.cc:367 #, c-format msgid "unconventional key: flats: %d, sharps: %d" msgstr "ÎÅÓÔÁÎÄÁÒÔÎÙÊ ËÌÀÞ: ÂÅÍÏÌÉ: %d, ÄÉÅÚÙ: %d" -#: midi-item.cc:413 +#: midi-item.cc:414 msgid "silly duration" msgstr "ÇÌÕÐÁÑ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: midi-item.cc:426 +#: midi-item.cc:427 msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" -#: midi-stream.cc:29 paper-stream.cc:50 -msgid "Error syncing file (disk full?)" -msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" - #: musical-request.cc:29 #, c-format msgid "Transposition by %s makes accidental larger than two" @@ -582,6 +582,10 @@ msgstr "" msgid "can't create directory: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" +#: paper-stream.cc:50 +msgid "Error syncing file (disk full?)" +msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" + #. #. We could change the current translator's id, but that would make #. errors hard to catch @@ -611,7 +615,7 @@ msgstr " msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" -#: performance.cc:161 +#: performance.cc:166 #, c-format msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." @@ -730,7 +734,7 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: text-spanner.cc:117 +#: text-spanner.cc:121 msgid "Text_spanner too small" msgstr "" @@ -764,11 +768,11 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tie-engraver.cc:212 tie-performer.cc:173 +#: tie-engraver.cc:211 tie-performer.cc:173 msgid "No ties were created!" msgstr "" -#: tie-engraver.cc:231 +#: tie-engraver.cc:230 msgid "lonely tie" msgstr "" diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index cf43961a60..697a1dd2c4 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -69,6 +69,7 @@ help: generic-help local-help release roll tarball and generate patch\n\ rpm build RedHat package\n\ po make new translation Portable Object database\n\ + po-replace do po-update and replace catalogs with msgmerged versions\n\ po-update update translation Portable Object database\n\ tar same as dist\n\ TAGS genarate tagfiles\n\ diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make index 6b5e125743..071089bd63 100644 --- a/stepmake/stepmake/po-targets.make +++ b/stepmake/stepmake/po-targets.make @@ -34,3 +34,5 @@ po-update: po po-changes: $(MAKE) -C $(po-dir) po-changes +po-replace: po + $(MAKE) -C $(po-dir) po-replace \ No newline at end of file diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make index a2da703d9e..d64120b6dd 100644 --- a/stepmake/stepmake/podir-targets.make +++ b/stepmake/stepmake/podir-targets.make @@ -27,3 +27,7 @@ po-update: po-changes: diff -e $(po-dir)/$(outdir)/$(LANGUAGE).po $(po-dir)/$(LANGUAGE).po \ | sed $(sed-pofile) $(sed-edstuff) + +po-replace: po-update + mv $(outdir)/$(package).po $(package).pot + mv $(outdir)/*.po . -- 2.39.2