Merge branch 'issue3330'

[lilypond.git] / Documentation / es / notation / vocal.itely

diff --git a/Documentation/es/notation/vocal.itely b/Documentation/es/notation/vocal.itely
index 2878f472f157d33cc89d92f94cc9aada485109d0..e48b69ea6da49c58812ce8f4d8c2e37d00ab2f12 100644 (file)
--- a/Documentation/es/notation/vocal.itely
+++ b/Documentation/es/notation/vocal.itely
@@ -1,14 +1,14 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
 
 @ignore
-    Translation of GIT committish: d409c67cbbdebe840220c17f796544a8a9dd193e
+    Translation of GIT committish: cccd2bf82ebfb55b6423346037fa4d2793fc4c3b
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.19"
 
 @node Música vocal
 @section Música vocal
@@ -1915,7 +1915,7 @@ propiedad @code{associatedVoice}:
     <<
       \new Voice = "alternative" {
         \voiceOne
-        \times 2/3 {
+        \tuplet 3/2 {
           % show associations clearly.
           \override NoteColumn.force-hshift = #-3
           f8 f g
@@ -2056,7 +2056,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
-      \vspace #0.1 % adds vertical spacing between verses
+      \combine \null \vspace #0.1 % adds vertical spacing between verses
       \line { \bold "3."
         \column {
           "This is verse three."
@@ -2072,7 +2072,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
-      \vspace #0.1 % adds vertical spacing between verses
+      \combine \null \vspace #0.1 % adds vertical spacing between verses
       \line { \bold "5."
         \column {
           "This is verse five."
@@ -2566,7 +2566,7 @@ usar @code{\instrumentSwitch} para indicar cada uno de los cambios.
   #`((instrumentTransposition . ,(ly:make-pitch -1 0 0))
      (shortInstrumentName . "Kas.")
      (clefGlyph . "clefs.G")
-     (clefOctavation . -7)
+     (clefTransposition . -7)
      (middleCPosition . 1)
      (clefPosition . -2)
      (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar"))
@@ -2576,7 +2576,7 @@ usar @code{\instrumentSwitch} para indicar cada uno de los cambios.
   #`((instrumentTransposition . ,(ly:make-pitch 0 0 0))
      (shortInstrumentName . "Mel.")
      (clefGlyph . "clefs.F")
-     (clefOctavation . 0)
+     (clefTransposition . 0)
      (middleCPosition . 6)
      (clefPosition . 2)
      (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior"))
@@ -3134,7 +3134,7 @@ global = {
       \layout {
         \context {
           \Score
-          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2)
         }
         \context {
           \Staff