Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / Documentation / hu / learning / fundamental.itely

diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely
index 5b089ddb8954ba09dbaf19386ae1615d695c7421..69104f29c657e618c9afdfefb1a97d3a5b6c1ab0 100644 (file)
--- a/Documentation/hu/learning/fundamental.itely
+++ b/Documentation/hu/learning/fundamental.itely
@@ -10,7 +10,7 @@
 
 
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c \version "2.13.36"
+@c \version "2.19.2"
 @node Alapfogalmak
 @chapter Alapfogalmak
 @translationof Fundamental concepts
@@ -482,10 +482,10 @@ frazeálóív, amely túlnyúlik a triolán.
 
 @lilypond[quote,verbatim,fragment,ragged-right]
 {
-  r16[ g16 \times 2/3 {r16 e'8] }
-  g16( a \times 2/3 {b d) e' }
-  g8[( a \times 2/3 {b d') e'~]}
-  \times 4/5 {e'32\( a b d' e'} a'4.\)
+  r16[ g16 \tuplet 3/2 {r16 e'8] }
+  g16( a \tuplet 3/2 {b d) e' }
+  g8[( a \tuplet 3/2 {b d') e'~]}
+  \tuplet 5/4 {e'32\( a b d' e'} a'4.\)
 }
 @end lilypond
 
@@ -636,7 +636,7 @@ stems, ties, dynamics etc., is set appropriately.
   c16 d e f
   %    Voice "1"     Voice "2"                 Voice "3"
   << { g4 f e } \\ { r8 e4 d c8~ } >>
-  << { d2 e2 }  \\ { c8 b16 a b8 g~ g2 } \\ { s4 b4 c2 } >>
+  << { d2 e2 }  \\ { c8 b16 a b8 g~ 2 } \\ { s4 b4 c2 } >>
 }
 @end lilypond
 
@@ -674,7 +674,7 @@ blue triangle voice.
     { d2 e2 }
   \\
      % Voice 2 continues
-    { c8 b16 a b8 g ~ g2 }
+    { c8 b16 a b8 g ~ 2 }
   \\
     {
       \voiceThreeStyle
@@ -757,9 +757,9 @@ later sections.
   \\  % Voice four
     {
       % Ignore these for now - they are explained in Ch 4
-      \once \override NoteColumn #'force-hshift = #0
+      \once \override NoteColumn.force-hshift = #0
       <ees c>2
-      \once \override NoteColumn #'force-hshift = #0.5
+      \once \override NoteColumn.force-hshift = #0.5
       des2
     }
   >> |
@@ -806,9 +806,9 @@ not understand.
   \\  % Voice four
     { \voiceThreeStyle
       % Ignore these for now - they are explained in Ch 4
-      \once \override NoteColumn #'force-hshift = #0
+      \once \override NoteColumn.force-hshift = #0
       <ees c>2
-      \once \override NoteColumn #'force-hshift = #0.5
+      \once \override NoteColumn.force-hshift = #0.5
       des2
     }
   >>
@@ -955,25 +955,25 @@ markup, ties, slurs, and dynamics:
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
   % Default behavior or behavior after \oneVoice
-  c d8~ d e4( f g a) b-> c
+  c d8~ 8 e4( f g a) b-> c
 }
 @end lilypond
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
   \voiceOne
-  c d8~ d e4( f g a) b-> c
+  c d8~ 8 e4( f g a) b-> c
   \oneVoice
-  c, d8~ d e4( f g a) b-> c
+  c, d8~ 8 e4( f g a) b-> c
 }
 @end lilypond
 
 @lilypond[quote,ragged-right,verbatim]
 \relative c'{
   \voiceTwo
-  c d8~ d e4( f g a) b-> c
+  c d8~ 8 e4( f g a) b-> c
   \oneVoice
-  c, d8~ d e4( f g a) b-> c
+  c, d8~ 8 e4( f g a) b-> c
 }
 @end lilypond
 
@@ -1002,7 +1002,7 @@ permitting a phrasing slur to be drawn over them.
     \new Voice {
       % Set stems, etc., down
       \voiceTwo
-      r8 e4 d c8~ | c8 b16 a b8 g~ g2 |
+      r8 e4 d c8~ | 8 b16 a b8 g~ 2 |
     }
     % Initiate third voice
     \new Voice {
@@ -1033,7 +1033,7 @@ typeset the music:
       \voiceTwo
       r8 e4 d c8~
       <<
-        { c8 b16 a b8 g~ g2 }
+        { c8 b16 a b8 g~ 2 }
         \new Voice {
           \voiceThree
           s4 b4 c2
@@ -1064,7 +1064,7 @@ as here:
   \new Voice {
     % Set stems, etc, down
     \voiceTwo
-    s4 r8 e4 d c8~ | c8 b16 a b8 g~ g2 |
+    s4 r8 e4 d c8~ | 8 b16 a b8 g~ 2 |
   }
   % Initiate third voice
   \new Voice {
@@ -1195,7 +1195,7 @@ rather than music.
 @lilypond[quote,verbatim]
 global = { \time 6/8 \partial 8 \key f \major}
 SopOneMusic = \relative c'' {
-  c8 | c([ bes)] a a([ g)] f | f'4. b, | c4.~ c4 | }
+  c8 | c([ bes)] a a([ g)] f | f'4. b, | c4.~ 4 | }
 SopTwoMusic = \relative c' {
   r8 | r4. r4 c8 | a'([ g)] f f([ e)] d | e([ d)] c bes' | }
 SopOneLyrics = \lyricmode {
@@ -1696,7 +1696,7 @@ Notation Reference: @ruser{Kontextusok létrehozása}.
 
 @node Az ábrázoló fogalma
 @subsection Az ábrázoló fogalma
-@subsection Az ábrázoló fogalma
+@translationof Engravers explained
 
 @cindex engravers
 
@@ -1749,8 +1749,7 @@ from the name, or vice versa.
   @tab Engraves clefs
 @item Completion_heads_engraver
   @tab Splits notes which cross bar lines
-@c The old Dynamic_engraver is deprecated. -jm
-@item New_dynamic_engraver
+@item Dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
   @tab Prevents line breaks if a musical element is still active
@@ -1864,7 +1863,7 @@ is specified, no error message is produced, but the expected
 action will not take place.  For example, the
 @code{instrumentName} clearly lives in the @code{Staff} context, since
 it is the staff that is to be named.
-In this example the first staff is labelled, but not the second,
+In this example the first staff is labeled, but not the second,
 because we omitted the context name.
 
 @lilypond[quote,verbatim,ragged-right]
@@ -1939,7 +1938,7 @@ and this turns them off in all staves:
 >>
 @end lilypond
 
-As another example, if @code{clefOctavation} is set in
+As another example, if @code{clefTransposition} is set in
 the @code{Score} context this immediately changes the value
 of the octavation in all current staves and sets a new default
 value which will be applied to all staves.
@@ -2128,7 +2127,7 @@ produced by the @code{Staff_symbol_engraver}.
 
 @lilypond[quote,verbatim,ragged-right]
 \new Staff \with {
-  \remove Staff_symbol_engraver
+  \remove "Staff_symbol_engraver"
 }
 \relative c' {
   c4
@@ -2159,7 +2158,7 @@ range from that voice only:
 @lilypond[quote,verbatim,ragged-right]
 \new Staff <<
   \new Voice \with {
-    \consists Ambitus_engraver
+    \consists "Ambitus_engraver"
   }
   \relative c'' {
     \voiceOne
@@ -2180,7 +2179,7 @@ the notes in all the voices on that staff:
 
 @lilypond[quote,verbatim,ragged-right]
 \new Staff \with {
-    \consists Ambitus_engraver
+    \consists "Ambitus_engraver"
   }
   <<
   \new Voice
@@ -2237,7 +2236,7 @@ staff in a four-staff score, we could write
   \layout {
     \context {
       \Staff
-      \consists Ambitus_engraver
+      \consists "Ambitus_engraver"
     }
   }
 }
@@ -2980,15 +2979,15 @@ ManualOneVoiceOneMusic = \relative g' {
   d2 c2
 }
 ManualOneVoiceTwoMusic = \relative c' {
-  ees16 d ees8~ ees16 f ees d c8 d~ d c~
+  ees16 d ees8~ 16 f ees d c8 d~ d c~
   c c4 b8 c8. g16 c b c d
 }
 ManualTwoMusic = \relative c' {
-  c16 b c8~ c16 b c g a8 g~ g16 g aes ees
-  f ees f d g aes g f ees d e8~ ees16 f ees d
+  c16 b c8~ 16 b c g a8 g~ 16 g aes ees
+  f ees f d g aes g f ees d e8~ 8es16 f ees d
 }
 PedalOrganMusic = \relative c {
-  r8 c16 d ees d ees8~ ees16 a, b g c b c8
+  r8 c16 d ees d ees8~ 16 a, b g c b c8
   r16 g ees f g f g8 c,2
 }
 
@@ -3069,7 +3068,7 @@ macros, or user-defined commands) for tweaks:
 @c TODO Avoid padtext - not needed with skylining
 @lilypond[quote,verbatim,ragged-right]
 dolce = \markup { \italic \bold dolce }
-padText = { \once \override TextScript #'padding = #5.0 }
+padText = { \once \override TextScript.padding = #5.0 }
 fthenp=_\markup { \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p }
 violin = \relative c'' {
   \repeat volta 2 {
@@ -3098,7 +3097,7 @@ the last line.
 violin = \relative c'' @{
   \repeat volta 2 @{
     c4._\markup @{ \italic \bold dolce @} b8 a8 g a b
-    \once \override TextScript #'padding = #5.0
+    \once \override TextScript.padding = #5.0
     c4.^"hi there!" d8 e' f g d
     c,4.\markup @{ \dynamic f \italic \small @{ 2nd @}
       \hspace #0.1 \dynamic p @}
@@ -3122,7 +3121,7 @@ can think of these as functions).
 padText =
 #(define-music-function (parser location padding) (number?)
   #{
-    \once \override TextScript #'padding = #$padding
+    \once \override TextScript.padding = #padding
   #})
 
 \relative c''' {