diff options
author | David Kastrup <dak@gnu.org> | 2015-05-28 17:36:12 +0200 |
---|---|---|
committer | David Kastrup <dak@gnu.org> | 2015-05-29 15:05:08 +0200 |
commit | a94d26b6693cad58b946a01b7efaaed29480f063 (patch) | |
tree | da840d07cfbc23ff600a9bae5947f60be34a345e /Documentation/hu | |
parent | 8c769fc52f092210a21288e81d008dc3f700a626 (diff) |
Run scripts/auxiliar/update-with-convert-ly.sh -f 2.19.20
Then revert Documentation/snippets/*.ly
Diffstat (limited to 'Documentation/hu')
-rw-r--r-- | Documentation/hu/essay/engraving.itely | 60 | ||||
-rw-r--r-- | Documentation/hu/learning/common-notation.itely | 12 | ||||
-rw-r--r-- | Documentation/hu/learning/fundamental.itely | 74 | ||||
-rw-r--r-- | Documentation/hu/usage/running.itely | 4 |
4 files changed, 75 insertions, 75 deletions
diff --git a/Documentation/hu/essay/engraving.itely b/Documentation/hu/essay/engraving.itely index 618ec88a10..223f9606e1 100644 --- a/Documentation/hu/essay/engraving.itely +++ b/Documentation/hu/essay/engraving.itely @@ -371,22 +371,22 @@ global = { \new Staff \with { \magnifyStaff #2/3 } - \relative c' { + \relative { \global \set Staff.instrumentName = #"Violin" - c8.(\f^> b16 c d) ees8.(^> d16 c b) + c'8.(\f^> b16 c d) ees8.(^> d16 c b) g8.(^> b16 c ees) g8-.^> r r R2. } \new PianoStaff << \set PianoStaff.instrumentName = #"Piano" - \new Staff \relative c' { + \new Staff \relative { \global s2. - s4. s8 r8 r16 <c f aes c> + s4. s8 r8 r16 <c' f aes c> <c f aes c>4.^> <c ees g>8 r r } - \new Staff \relative c { + \new Staff \relative { \global \clef "bass" << @@ -464,7 +464,7 @@ How do we actually make formatting decisions? In other words, which of the three configurations should we choose for the following slur? @lilypond -\relative c { +\relative { \clef bass \once \override Slur.positions = #'(1.5 . 1) e8[( f] g[ a b d,)] r4 @@ -504,7 +504,7 @@ has given each one a score in @q{ugly points}. The first example gets 15.39 points for grazing one of the noteheads: @lilypond -\relative c { +\relative { \clef bass \once \override Slur.positions = #'(1.5 . 1) e8[(_"15.39" f] g[ a b d,)] r4 @@ -518,7 +518,7 @@ side, plus another 2 points because the slur ascends while the melody descends for a total of 13.08 ugly points: @lilypond -\relative c { +\relative { \clef bass \once \override Slur.positions = #'(2 . 3) e8[(_"13.08" f] g[ a b d,)] r4 @@ -682,24 +682,24 @@ measures 28--29, as shown here with Finale first and LilyPond second: @lilypond[staffsize=19.5,line-width=14\cm] global = { \key g \minor } -partI = \relative c' { +partI = \relative { \voiceOne - fis8 d' ees g, fis4 g + fis'8 d' ees g, fis4 g r8 a16 bes c8 bes16 a d8 r r4 } -partII = \relative c' { +partII = \relative { \voiceTwo - d4 r4 r8 d'16 c bes8 c16 d + d'4 r4 r8 d'16 c bes8 c16 d ees8 d c ees a, r r4 } -partIII = \relative c' { +partIII = \relative { \voiceOne - r2 r8 d ees g, fis4 g r8 a16 bes c8 bes16 a + r2 r8 d' ees g, fis4 g r8 a16 bes c8 bes16 a } -partIV = \relative c { +partIV = \relative { \voiceTwo d4 r r2 r8 d ees g, fis4 a @@ -987,16 +987,16 @@ consider a more complicated musical example: \new PianoStaff << \new Staff = "RH" << - \new Voice = "I" \relative c''' { + \new Voice = "I" \relative { \time 3/4 \voiceOne - \tuplet 7/6 { g8 g g g g g g } + \tuplet 7/6 { g''8 g g g g g g } \oneVoice r4 <b,, fis' g bes> r4\fermata } - \new Voice = "II" \relative c' { + \new Voice = "II" \relative { \voiceTwo - c4 + c'4 \tuplet 5/4 { <c ees>8 f g \change Staff = "LH" \oneVoice @@ -1273,8 +1273,8 @@ chord has all directions up (right). @lilypond[quote,ragged-right] \score { - \relative c' { - \stemDown <e g b>4_>-\arpeggio + \relative { + \stemDown <e' g b>4_>-\arpeggio \override Arpeggio.direction = #RIGHT \stemUp <e g b>4^>-\arpeggio } @@ -1343,11 +1343,11 @@ note head symbol is changed during the music fragment. ((-2) (make-smaller-markup (make-bold-markup "2"))) (else "bla"))))))))) -\new Voice \relative c' { +\new Voice \relative { \stemUp \set autoBeaming = ##f \time 2/4 - <d f g>4 + <d' f g>4 \once \override NoteHead.stencil = #note-head::brew-ez-stencil \once \override NoteHead.font-size = #-7 \once \override NoteHead.font-family = #'sans @@ -1562,9 +1562,9 @@ LilyPond, version @version{}: @lilypond[staffsize=14.3,line-width=15.9\cm] global = {\key g \minor} -partI = \relative c' { +partI = \relative { \voiceOne - fis8 d' ees g, fis4 g + fis'8 d' ees g, fis4 g r8 a16 bes c8 bes16 a d8 r r4 r2 r8 d16 ees f8 ees16 d ees4 ~ 16 d c bes a4 r8 ees'16 d @@ -1573,9 +1573,9 @@ partI = \relative c' { a2 g\fermata \bar "|." } -partII = \relative c' { +partII = \relative { \voiceTwo - d4 r4 r8 d'16 c bes8 c16 d + d'4 r4 r8 d'16 c bes8 c16 d ees8 d c ees a, r r4 r8 fis16 g a8 g16 fis g2 ~ 2 r8 d' ees g, @@ -1583,16 +1583,16 @@ partII = \relative c' { bes4. <g b>8 <a c> r <d, g> r <ees g>4 <d fis> d2 } -partIII = \relative c' { +partIII = \relative { \voiceOne - r2 r8 d ees g, fis4 g r8 a16 bes c8 bes16 a + r2 r8 d' ees g, fis4 g r8 a16 bes c8 bes16 a bes2 ~ 8 b16 a g8 a16 b c4 r r2 R1 r8 d ees g, fis4 g r8 a16 bes c8 bes16 a b2 } -partIV = \relative c { +partIV = \relative { \voiceTwo d4 r r2 r8 d ees g, fis4 a diff --git a/Documentation/hu/learning/common-notation.itely b/Documentation/hu/learning/common-notation.itely index 860b5bebbe..b87158f529 100644 --- a/Documentation/hu/learning/common-notation.itely +++ b/Documentation/hu/learning/common-notation.itely @@ -987,11 +987,11 @@ megtanultunk a dallam és szöveg összekapcsolásáról: @c but the example is long enough to avoid looking strange. @lilypond[verbatim,quote,noragged-right] << - \relative c' { + \relative { \key g \major \time 3/4 \partial 4 - d4 g4 g a8( b) g4 g4 + d'4 g4 g a8( b) g4 g4 b8( c) d4 d e4 c2 } \addlyrics { @@ -1042,20 +1042,20 @@ mely Händel @notation{Júdás Makkabeus} c. oratóriumából való: @lilypond[verbatim,quote] << - \relative c'' { + \relative { \key f \major \time 6/8 \partial 8 - c8 c([ bes]) a a([ g]) f f'4. b, c4.~ 4 + c''8 c([ bes]) a a([ g]) f f'4. b, c4.~ 4 } \addlyrics { Let flee -- cy flocks the hills a -- dorn, __ } - \relative c' { + \relative { \key f \major \time 6/8 \partial 8 - r8 r4. r4 c8 a'([ g]) f f([ e]) d e([ d]) c bes'4 + r8 r4. r4 c'8 a'([ g]) f f([ e]) d e([ d]) c bes'4 } \addlyrics { Let flee -- cy flocks the hills a -- dorn, diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely index ebfff9dc3b..100f69c5a4 100644 --- a/Documentation/hu/learning/fundamental.itely +++ b/Documentation/hu/learning/fundamental.itely @@ -774,12 +774,12 @@ Leginkább viszont akkor van szükségünk többszörös szólamokra, amikor a h @c The following should appear as music without code @c The three voice styles should be defined in -init @lilypond[quote,ragged-right] -\new Staff \relative c'' { +\new Staff \relative { \key aes \major << { % 1. szólam \voiceOneStyle - c2 aes4. bes8 + c''2 aes4. bes8 } \\ % 2. szólam { \voiceTwoStyle @@ -952,10 +952,10 @@ The red diamond-shaped notes demonstrate that the main melody is now in a single permitting a phrasing slur to be drawn over them. @lilypond[quote,ragged-right,verbatim] -\new Staff \relative c' { +\new Staff \relative { \voiceOneStyle % A következő hangok monofónok - c16^( d e f + c'16^( d e f % Szimultán rész három szólammal << % Continue the main voice in parallel @@ -1009,11 +1009,11 @@ Létrehozhatunk többszörösen beágyazott polifón szerkezetet is, és ha a sz A szólamokat akkor érdemes így írni, ha a zene csak egy kis része polifón. Viszont amikor az egész ötvonalas kotta nagyrésze polifón, egyszerűbb, ha többszörös szólamokat használunk mindenütt, -- ritkított hangokkal, hogy átlépjük azokat a részeket, ahol a szólamok üresek. Az alábbi példa ezt mutatja: @lilypond[quote,ragged-right,verbatim] -\new Staff \relative c' << +\new Staff \relative << % Initiate first voice \new Voice { \voiceOne - c16^( d e f g4 f e | d2 e2) | + c'16^( d e f g4 f e | d2 e2) | } % Initiate second voice \new Voice { @@ -1096,10 +1096,10 @@ name assigned to the Voice. @lilypond[quote,verbatim,fragment] << - \new Voice = "one" \relative c'' { + \new Voice = "one" \relative { \autoBeamOff \time 2/4 - c4 b8. a16 g4. f8 e4 d c2 + c''4 b8. a16 g4. f8 e4 d c2 } \new Lyrics \lyricsto "one" { No more let sins and sor -- rows grow. @@ -1814,13 +1814,13 @@ because we omitted the context name. @lilypond[quote,verbatim,ragged-right] << - \new Staff \relative c'' { + \new Staff \relative { \set Staff.instrumentName = #"Soprano" - c4 c + c''4 c } - \new Staff \relative c' { + \new Staff \relative { \set instrumentName = #"Alto" % Wrong! - d4 d + d'4 d } >> @end lilypond @@ -1862,9 +1862,9 @@ So this turns off extra naturals in one staff: \new Staff \relative { ais'4 aes } - \new Staff \relative c'' { + \new Staff \relative { \set Staff.extraNatural = ##f - ais4 aes + ais'4 aes } >> @end lilypond @@ -1877,9 +1877,9 @@ and this turns them off in all staves: \new Staff \relative { ais'4 aes } - \new Staff \relative c'' { + \new Staff \relative { \set Score.extraNatural = ##f - ais4 aes + ais'4 aes } >> @end lilypond @@ -2106,14 +2106,14 @@ range from that voice only: \new Voice \with { \consists "Ambitus_engraver" } - \relative c'' { + \relative { \voiceOne - c a b g + c'' a b g } \new Voice - \relative c' { + \relative { \voiceTwo - c e d f + c' e d f } >> @end lilypond @@ -2129,14 +2129,14 @@ the notes in all the voices on that staff: } << \new Voice - \relative c'' { + \relative { \voiceOne - c a b g + c'' a b g } \new Voice - \relative c' { + \relative { \voiceTwo - c e d f + c' e d f } >> @end lilypond @@ -2444,17 +2444,17 @@ bassMusic = \relative { r4 d'2 cis4 | b4. b8 fis2 | e4 d a'2 | } bassWords = \sopranoWords -upper = \relative a' { +upper = \relative { \clef "treble" \global - r4 <a d fis>2 <a e' a>4 + r4 <a' d fis>2 <a e' a>4 <d fis d'>4. <d fis d'>8 <a d a'>2 <g cis g'>4 <a d fis> <a cis e>2 } -lower = \relative c, { +lower = \relative { \clef "bass" \global - <d d'>4 <d d'>2 <cis cis'>4 + <d, d'>4 <d d'>2 <cis cis'>4 <b b'>4. <b' b'>8 <fis fis'>2 <e e'>4 <d d'> <a' a'>2 } @@ -2673,17 +2673,17 @@ bassMusic = \relative { r4 d'2 cis4 | b4. b8 fis2 | e4 d a'2 | } bassWords = \sopranoWords -upper = \relative a' { +upper = \relative { \clef "treble" \global - r4 <a d fis>2 <a e' a>4 + r4 <a' d fis>2 <a e' a>4 <d fis d'>4. <d fis d'>8 <a d a'>2 <g cis g'>4 <a d fis> <a cis e>2 } -lower = \relative c, { +lower = \relative { \clef "bass" \global - <d d'>4 <d d'>2 <cis cis'>4 + <d, d'>4 <d d'>2 <cis cis'>4 <b b'>4. <b' b'>8 <fis fis'>2 <e e'>4 <d d'> <a' a'>2 } @@ -3016,9 +3016,9 @@ macros, or user-defined commands) for tweaks: dolce = \markup { \italic \bold dolce } padText = { \once \override TextScript.padding = #5.0 } fthenp=_\markup { \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p } -violin = \relative c'' { +violin = \relative { \repeat volta 2 { - c4._\dolce b8 a8 g a b + c''4._\dolce b8 a8 g a b \padText c4.^"hi there!" d8 e' f g d c,4.\fthenp b8 c4 c-. @@ -3040,9 +3040,9 @@ variables. It's a lot harder to read, especially the last line. @example -violin = \relative c'' @{ +violin = \relative @{ \repeat volta 2 @{ - c4._\markup @{ \italic \bold dolce @} b8 a8 g a b + c''4._\markup @{ \italic \bold dolce @} b8 a8 g a b \once \override TextScript.padding = #5.0 c4.^"hi there!" d8 e' f g d c,4.\markup @{ \dynamic f \italic \small @{ 2nd @} @@ -3170,7 +3170,7 @@ This command sets the property @code{skipBars} in the this option to the music above, leads to the following result @lilypond[quote,ragged-right] -\transpose f c' \relative c { +\transpose f c' \relative { \time 2/4 \set Score.skipBars = ##t R2*3 diff --git a/Documentation/hu/usage/running.itely b/Documentation/hu/usage/running.itely index 4b353eafbc..497ce43d0d 100644 --- a/Documentation/hu/usage/running.itely +++ b/Documentation/hu/usage/running.itely @@ -558,8 +558,8 @@ A megoldás a @code{\repeat} és a @code{\relative} parancsok felcserélése, a következő módon: @lilypond[quote,verbatim] -\relative c' { - \repeat unfold 2 { c d e f } +\relative { + \repeat unfold 2 { c' d e f } } @end lilypond |