From 446103a87933b297c209e87fec94e97fe9462ad0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 12 Jul 2011 20:51:43 +0200 Subject: [PATCH] Doc [nl]: Translation update. --- .../nl/included/generating-output.itexi | 6 +- .../nl/learning/common-notation.itely | 32 +-- Documentation/nl/learning/fundamental.itely | 201 ++++++++++++------ Documentation/nl/learning/tutorial.itely | 33 ++- Documentation/nl/macros.itexi | 34 ++- Documentation/nl/search-box.ihtml | 8 +- Documentation/nl/web.texi | 46 ++-- Documentation/nl/web/download.itexi | 48 +++-- Documentation/nl/web/introduction.itexi | 163 ++++++++++---- Documentation/nl/web/manuals.itexi | 68 +++--- 10 files changed, 440 insertions(+), 199 deletions(-) diff --git a/Documentation/nl/included/generating-output.itexi b/Documentation/nl/included/generating-output.itexi index 1259b05c7c..f2f5c13aac 100644 --- a/Documentation/nl/included/generating-output.itexi +++ b/Documentation/nl/included/generating-output.itexi @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; fill-column: 60 -*- @ignore - Translation of GIT committish: b275aa092642adb798079f7853309e2f5e4383ce + Translation of GIT committish: 6908517be0826a3386264cd6d26d742b18e3a227 When revising a translation, copy the HEAD committish of the version that you are working on. For details, see the Contributors' @@ -214,7 +214,7 @@ Maak een tekstbestand met de naam @file{test.ly} en vul het met: @c double \\ required because this is inside a macro! @example -\\version "@w{@version{}}" +\\version "@w{@versionStable{}}" @{ c' e' g' e' @} @@ -234,7 +234,7 @@ lilypond test.ly Je ziet dan iets dat lijkt op: @example -GNU LilyPond @w{@version{}} +GNU LilyPond @w{@versionStable{}} Verwerken van `test.ly' Ontleden... Vertolken van muziek... diff --git a/Documentation/nl/learning/common-notation.itely b/Documentation/nl/learning/common-notation.itely index d12808b24f..55ab796c98 100644 --- a/Documentation/nl/learning/common-notation.itely +++ b/Documentation/nl/learning/common-notation.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; fill-column: 60 -*- @ignore - Translation of GIT committish: 66dd932f6519b7913400a838c5efbc5407e06cd8 + Translation of GIT committish: 6908517be0826a3386264cd6d26d742b18e3a227 When revising a translation, copy the HEAD committish of the version that you are working on. For details, see the Contributors' @@ -170,7 +170,7 @@ a1 | Terminologie: @rglos{accidental}, @rglos{key signature}, @rglos{pitch}, @rglos{flat}, @rglos{natural}, @rglos{sharp}, -@rglos{transposition}. +@rglos{transposition}, @rglos{Pitch names}. Om uit te maken of er wel of geen @notation{toevallig teken} geprint moet worden, onderzoekt LilyPond de toonhoogten en @@ -239,9 +239,6 @@ Notatiehandleiding: @ruser{Automatic accidentals}, @ruser{Key signature}. -Terminologie: -@rglos{Pitch names}. - @node Overbindingen en legatobogen @translationof Ties and slurs @@ -852,7 +849,10 @@ partituren. @funindex GrandStaff @funindex ChoirStaff -Terminologie: @rglos{brace}. +Terminologie: +@rglos{brace}, +@rglos{staff}, +@rglos{system}. Pianomuziek wordt meestal genoteerd op twee notenbalken die verbonden zijn door een @notation{accolade}. Het afdrukken @@ -897,6 +897,8 @@ Notatiehandleiding: @translationof Combining notes into chords @subsection Het combineren van noten tot accoorden +Terminologie: @rglos{chord}. + @cindex accoorden @cindex nootlengten in accoorden @@ -904,8 +906,6 @@ Notatiehandleiding: @funindex > @funindex < ... > -Terminologie: @rglos{chord}. - We zagen eerder hoe noten kunnen worden gecombineerd tot @notation{accoorden} door aan te geven dat ze tegelijk klinken door ze tussen dubbele gehoekte haken te zetten. @@ -927,10 +927,15 @@ waardestrepen en overbindingen gebruiken met accoorden. Ze worden geplaatst buiten de hoekige haken. @lilypond[verbatim,quote,relative=2] -r4 8[ ]~ 2 | -r4 8( \> 4 \!) | +r4 ~ 2 | +8[ ] \>[ ]\! | +r4 8.\p 16( 4-. ) | @end lilypond +@seealso +Notatiehandleiding: +@ruser{Chorded notes}. + @node Polyfonie binnen een notenbalk @translationof Single staff polyphony @@ -1017,15 +1022,14 @@ een spatie. >> @end lilypond -Merk de accolades op die zowel de muziek als de liedtekst -afbakenen. Het is van essentiëel belang dat de laatste +@warning{Het is van essentiëel belang dat de laatste lettergreep van de afsluitende accolade gescheiden wordt door een spatie of nieuwe regel, anders wordt aangenomen dat de accolade nog deel uitmaakt van die lettergreep, wat een obscure foutmelding oplevert, zie @rprogram{Apparent error -in ../ly/init.ly}. +in ../ly/init.ly}.} -Merk tevens de hoekige haken @w{@code{<< ... >>}} op die om +Merk de hoekige haken @w{@code{<< ... >>}} op die om het hele stuk heen staan en aangeven dat de muziek en de woorden tegelijk klinken. diff --git a/Documentation/nl/learning/fundamental.itely b/Documentation/nl/learning/fundamental.itely index 05557e40cc..9f33f9a1da 100644 --- a/Documentation/nl/learning/fundamental.itely +++ b/Documentation/nl/learning/fundamental.itely @@ -545,8 +545,8 @@ So, for example, a phrasing slur can start before a manually inserted beam and end before the end of the beam -- not very musical, perhaps, but possible: -@lilypond[quote,verbatim,fragment,ragged-right,relative=2] - { g8\( a b[ c b\) a] g4 } +@lilypond[quote,verbatim,ragged-right,relative=2] +g8\( a b[ c b\) a] g4 @end lilypond In general, different kinds of brackets, bracket-like constructs, @@ -556,13 +556,11 @@ a slur extending into a tuplet (line 2), a beam and a slur extending into a tuplet, a tie crossing two tuplets, and a phrasing slur extending out of a tuplet (lines 3 and 4). -@lilypond[quote,verbatim,fragment,ragged-right] -{ - r16[ g \times 2/3 { r16 e'8] } - g16( a \times 2/3 { b16 d) e' } - g8[( a \times 2/3 { b8 d') e'~] } | - \times 4/5 { e'32\( a b d' e' } a'4.\) -} +@lilypond[quote,verbatim,ragged-right,relative=1] +r16[ g \times 2/3 { r16 e'8] } +g,16( a \times 2/3 { b16 d) e } +g,8[( a \times 2/3 { b8 d) e~] } | +\times 4/5 { e32\( a, b d e } a4.\) @end lilypond @@ -614,7 +612,7 @@ A single voice can contain many notes in a chord, of course, so when exactly are multiple voices needed? Look first at this example of four chords: -@lilypond[quote,verbatim,fragment,ragged-right,relative=1] +@lilypond[quote,verbatim,ragged-right,relative=1] \key g \major 4 @end lilypond @@ -649,7 +647,7 @@ of polyphony. Here's how we split the chords above into two voices and add both the passing note and a slur: -@lilypond[quote,verbatim,fragment,ragged-right,relative=2] +@lilypond[quote,verbatim,ragged-right,relative=2] \key g \major % Voice "1" Voice "2" << { g4 fis8( g) a4 g } \\ { d4 d d d } >> @@ -659,7 +657,7 @@ Notice how the stems of the second voice now point down. Here's another simple example: -@lilypond[quote,verbatim,fragment,ragged-right,relative=2] +@lilypond[quote,verbatim,ragged-right,relative=2] \key d \minor % Voice "1" Voice "2" << { r4 g g4. a8 } \\ { d,2 d4 g } >> | @@ -668,12 +666,12 @@ Here's another simple example: @end lilypond It is not necessary to use a separate @code{<< \\ >>} construct -for each bar. For music with few notes in each bar this layout +for each bar. For music with few notes in each bar this layout can help the legibility of the code, but if there are many notes in each bar it may be better to split out each voice separately, like this: -@lilypond[quote,verbatim,fragment,ragged-right,relative=2] +@lilypond[quote,verbatim,ragged-right,relative=2] \key d \minor << { % Voice "1" @@ -692,7 +690,7 @@ separately, like this: @cindex voices, naming @cindex voices crossing brackets @cindex slurs crossing brackets -@cindex ties crossing brackest +@cindex ties crossing brackets This example has just two voices, but the same construct may be used to encode three or more voices by adding more back-slash @@ -702,7 +700,7 @@ The Voice contexts bear the names @code{"1"}, @code{"2"}, etc. In each of these contexts, the vertical direction of slurs, stems, ties, dynamics etc., is set appropriately. -@lilypond[quote,verbatim,fragment] +@lilypond[quote,verbatim] \new Staff \relative c' { % Main voice c16 d e f @@ -894,7 +892,7 @@ shall see, this encounters some difficulties. We begin as we have learnt, using the @code{<< \\ >>} construct to enter the music of the first bar in three voices: -@lilypond[quote,verbatim,fragment,ragged-right] +@lilypond[quote,verbatim,ragged-right] \new Staff \relative c'' { \key aes \major << @@ -914,10 +912,10 @@ odd-numbered voices taking upward stems and the even-numbered voices downward ones. The stems for voices 1 and 2 are right, but the stems in voice 3 should go down in this particular piece of music. We can correct this by skipping voice three -and placing the music in voice four. This is done by simply +and placing the music in voice four. This is done by simply adding another pair of @code{\\}. -@lilypond[quote,verbatim,fragment,ragged-right] +@lilypond[quote,verbatim,ragged-right] \new Staff \relative c'' { \key aes \major << % Voice one @@ -941,11 +939,11 @@ voices to occupy the same vertical note column provided the stems are in opposite directions, but the notes from the third and fourth voices are displaced, if necessary, to avoid the note heads colliding. This usually works well, but in this example the notes of the lowest voice -are clearly not well placed by default. LilyPond provides several ways +are clearly not well placed by default. LilyPond provides several ways to adjust the horizontal placing of notes. We are not quite ready yet to see how to correct this, so we shall leave this problem until a -later section --- see the @code{force-hshift} property in @ref{Fixing -overlapping notation}. +later section --- see the @code{force-hshift} property in +@ref{Fixing overlapping notation}. @seealso @@ -1174,7 +1172,7 @@ relative to the other notes. The @code{\shiftOn}, @code{\shiftOnn}, @code{\shiftOnnn}, and @code{\shiftOff} commands specify the degree to which notes and chords of the voice should be shifted if a collision -would otherwise occur. By default, the outer voices (normally +would otherwise occur. By default, the outer voices (normally voices one and two) have @code{\shiftOff} specified, while the inner voices (three and four) have @code{\shiftOn} specified. When a shift is applied, voices one and three are shifted to @@ -1217,7 +1215,7 @@ explicitly link the lyrics to the notes with @code{\lyricsto@{@}}, using the name assigned to the Voice. -@lilypond[quote,verbatim,fragment] +@lilypond[quote,verbatim] << \new Voice = "one" { \relative c'' { @@ -1391,7 +1389,7 @@ appear explicitly in the input file must be added to the output. For example, compare the input and output of the following example: -@lilypond[quote,verbatim,relative=2,fragment] +@lilypond[quote,verbatim,relative=2] cis4 cis2. | a4 a2. | @end lilypond @@ -1485,16 +1483,11 @@ where @var{type} is a context name (like @code{Staff} or @code{Voice}). This command creates a new context, and starts interpreting the @var{music-expression} within that context. -(Note that a @code{\new Score} command is not normally required, -as the essential top-level @code{Score} context is created -automatically when the music expression within the @code{\score} -block is interpreted. The only reason for creating a @code{Score} -context explicitly using @code{\new Score} is to introduce a -@code{\with} block in which one or more score-wide default values -of context properties may be specified. Information on using -@code{\with} blocks can be found under the heading -@qq{Setting context properties with @code{\\with} } in -@ref{Modifying context properties}.) +@warning{@bs{}@code{new Score} should not be used as the essential +top-level @code{Score} context is created automatically when the music +expression within the @bs{}@code{score} block is interpreted. Score-wide +default values of context properties can be changed within the +@bs{}@code{layout} block. See @ref{Modifying context properties}} You have seen many practical examples which created new @code{Staff} and @code{Voice} contexts in earlier sections, but @@ -1837,7 +1830,7 @@ font size, which affects the size of the note heads (among other things) several times. The change is from the default value, not the most recently set value. -@lilypond[quote,verbatim,ragged-right,relative=1,fragment] +@lilypond[quote,verbatim,ragged-right,relative=1] c4 d % make note heads smaller \set fontSize = #-4 @@ -1895,27 +1888,6 @@ like this: >> @end lilypond -Or, if the property override is to be applied to all staves -within the score, it may be appended to an explicit -@code{\new Score} command, like this: - -@lilypond[quote,verbatim,ragged-right] -\score { - \new Score \with { extraNatural = ##f } << - \new Staff { - \relative c'' { - gis4 ges aes ais - } - } - \new Staff { - \relative c'' { - gis4 ges aes ais - } - } - >> -} -@end lilypond - Properties set in this way may still be changed dynamically using @code{\set} and returned to the default value set in the @code{\with} block with @code{\unset}. @@ -1960,6 +1932,31 @@ throughout the @code{\score} or @code{\book} block in which the } @end lilypond +If the property override is to be applied to all staves +within the score: + +@lilypond[quote,verbatim] +\score { + << + \new Staff { + \relative c'' { + gis4 ges aes ais + } + } + \new Staff { + \relative c'' { + gis4 ges aes ais + } + } + >> + \layout { + \context { + \Score extraNatural = ##f + } + } +} +@end lilypond + @noindent Context properties set in this way may be overridden for particular instances of contexts by statements in a @code{\with} block, and by @@ -2133,11 +2130,16 @@ for all contexts of a particular type by including the @code{\set} command in a @code{\context} block in the same way. - @seealso Notation Reference: @ruser{Modifying context plug-ins}, @ruser{Changing context default settings}. +@knownissues +The @code{Stem_engraver} and @code{Beam_engraver} attach their +objects to note heads. If the @code{Note_heads_engraver} is removed +no note heads are produced and therefore no stems or beams are created +either. + @node Extending the templates @section Extending the templates @@ -2454,8 +2456,8 @@ lower = \relative c, { @end lilypond None of the templates provides this layout exactly. The nearest is -@q{SATB vocal score and automatic piano reduction} -- see @ref{Vocal -ensembles} -- but we need to change the layout and add a piano +@q{SATB vocal score and automatic piano reduction} -- see +@ref{Vocal ensembles} -- but we need to change the layout and add a piano accompaniment which is not derived automatically from the vocal parts. The variables holding the music and words for the vocal parts are fine, but we shall need to add variables for the piano reduction. @@ -2844,6 +2846,76 @@ signature to each staff using our predefined variable, @code{\keyTime}. @} % end Score context @end example +@cindex stretchability of staves +@cindex staves, stretchability + +The above layout of the organ staves is almost perfect; however, +there is a slight defect which is not visible by looking at just a +single system: The distance of the pedal staff to the left hand staff +should behave approximately the same as the right hand staff to the +left hand staff. In particular, the stretchability of staves in a +@code{PianoStaff} context is limited (so that the distance between +the staves for the left and right hand can't become too large), and +the pedal staff should behave similarly. + +@cindex sub-properties +@cindex properties, sub-properties +@cindex graphical objects +@cindex objects, graphical +@cindex grobs + +Stretchability of staves can be controlled with the +@code{staff-staff-spacing} property of the +@code{VerticalAxisGroup} @q{graphical object} (commonly called +@q{grob}s within the lilypond documentation) -- don't worry about +the details right now; this is fully explained later. For the +curious, have a look at @ruser{Overview of modifying properties}. +In this case, we want to modify the @code{stretchability} +sub-property only. Again, for the curious, you can find the +default values for the staff-staff-spacing property +in file @file{scm/define-grobs.scm} by looking up the definition +of the @code{VerticalAxisGroup} grob. The value for +@code{stretchability} is taken from the definition of the +@code{PianoStaff} context (in file @file{ly/engraver-init.ly}) +so that the values are identical. + +@example +\score @{ + << % PianoStaff and Pedal Staff must be simultaneous + \new PianoStaff << + \new Staff = "ManualOne" << + \keyTime % set key and time signature + \clef "treble" + \new Voice @{ + \voiceOne + \ManualOneVoiceOneMusic + @} + \new Voice @{ + \voiceTwo + \ManualOneVoiceTwoMusic + @} + >> % end ManualOne Staff context + \new Staff = "ManualTwo" \with @{ + \override VerticalAxisGroup + #'staff-staff-spacing #'stretchability = 5 + @} << + \keyTime + \clef "bass" + \new Voice @{ + \ManualTwoMusic + @} + >> % end ManualTwo Staff context + >> % end PianoStaff context + \new Staff = "PedalOrgan" << + \keyTime + \clef "bass" + \new Voice @{ + \PedalOrganMusic + @} + >> % end PedalOrgan Staff + >> +@} % end Score context +@end example That completes the structure. Any three-staff organ music will have a similar structure, although the number of voices may vary. All that remains now @@ -2887,7 +2959,10 @@ PedalOrganMusic = \relative c { \ManualOneVoiceTwoMusic } >> % end ManualOne Staff context - \new Staff = "ManualTwo" << + \new Staff = "ManualTwo" \with { + \override VerticalAxisGroup + #'staff-staff-spacing #'stretchability = 5 + } << \keyTime \clef "bass" \new Voice { @@ -2906,6 +2981,9 @@ PedalOrganMusic = \relative c { } % end Score context @end lilypond +@seealso +Music Glossary: +@rglos{system}. @node Saving typing with variables and functions @subsection Saving typing with variables and functions @@ -3156,4 +3234,3 @@ leading to >> @end lilypond - diff --git a/Documentation/nl/learning/tutorial.itely b/Documentation/nl/learning/tutorial.itely index 0b08b426b0..055bc6f87b 100644 --- a/Documentation/nl/learning/tutorial.itely +++ b/Documentation/nl/learning/tutorial.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; fill-column: 60 -*- @ignore - Translation of GIT committish: 66dd932f6519b7913400a838c5efbc5407e06cd8 + Translation of GIT committish: 6908517be0826a3386264cd6d26d742b18e3a227 When revising a translation, copy the HEAD committish of the version that you are working on. For details, see the Contributors' @@ -389,16 +389,42 @@ naam @code{r}@tie{}: Terminologie: @rglos{time signature}. -De @notation{maatsoort} kun je aangeven met het @code{\time} -commando: +De @notation{maatsoort} kun je aangeven met het @code{\time}-commando: + +@lilypond[verbatim,quote] +\relative c'' { + \time 3/4 + a4 a a + \time 6/8 + a4. a + \time 4/4 + a4 a a a +} +@end lilypond + +@subheading Tempo-aanduidingen + +@cindex tempo marks +@cindex metronome marks + +@funindex \tempo +@funindex tempo + +Terminologie: @rglos{tempo indication}, @rglos{metronome}. + +De @notation{tempo indication} en @notation{metronome mark} worden +gezet met het @code{\tempo}-commando: @lilypond[verbatim,quote] \relative c'' { \time 3/4 + \tempo "Andante" a4 a a \time 6/8 + \tempo 4. = 96 a4. a \time 4/4 + \tempo "Presto" 4 = 120 a4 a a a } @end lilypond @@ -444,6 +470,7 @@ toont: \relative c, { \clef "bass" \time 3/4 + \tempo "Andante" 4 = 120 \clef "bass" c2 e8 c' g'2. diff --git a/Documentation/nl/macros.itexi b/Documentation/nl/macros.itexi index a7e20d7b5f..75288f4cd6 100644 --- a/Documentation/nl/macros.itexi +++ b/Documentation/nl/macros.itexi @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 77c34ddc0877c0625a48e1b41049b6dbaae215e0 + Translation of GIT committish: 6908517be0826a3386264cd6d26d742b18e3a227 When revising a translation, copy the HEAD committish of the version that you are working on. For details, see the Contributors' @@ -16,7 +16,7 @@ MACRO DEFINITIONS GUIDELINES **************************** -This file should contain macro defintions which are common to all +This file should contain macro definitions which are common to all languages, i.e. all macro definitions which do not contain text that should be translated (namely text visible in the output). @@ -68,6 +68,36 @@ translations should be in macros.itexi. @end ifnothtml +@c do not translate the following macro -- it is used in +@c an untranslated manual. + +@ifhtml + +@macro advanced{TEXT} +@html +
+@end html +@strong{Advanced note:} \TEXT\ +@c keep the space for proper nesting of

+ +@html +
+@end html +@end macro + +@end ifhtml + +@ifnothtml + +@macro advanced{TEXT} +@quotation +@b{Advanced note:} \TEXT\ +@end quotation +@end macro + +@end ifnothtml + + @macro docMain @cartouche Voor meer informatie over waar deze handleiding in de rest van de diff --git a/Documentation/nl/search-box.ihtml b/Documentation/nl/search-box.ihtml index b28d1a7ee8..51687b7765 100644 --- a/Documentation/nl/search-box.ihtml +++ b/Documentation/nl/search-box.ihtml @@ -1,5 +1,5 @@