Run scripts/auxiliar/update-with-convert-ly.sh

diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely
index 2a9bf9157a3e3cef809f334e6f19bd6c93ca5eeb..858db18da05c3557eb2a1002efa48a6ca3782aa1 100644 (file)
--- a/Documentation/de/notation/vocal.itely
+++ b/Documentation/de/notation/vocal.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.19"
 
 @c Translators: Till Paala
 
@@ -2064,7 +2064,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."
@@ -2080,7 +2080,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."

diff --git a/Documentation/es/notation/vocal.itely b/Documentation/es/notation/vocal.itely
index 12b63fd7b09277d3b822392aba89f09ac09aab45..e48b69ea6da49c58812ce8f4d8c2e37d00ab2f12 100644 (file)
--- a/Documentation/es/notation/vocal.itely
+++ b/Documentation/es/notation/vocal.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.19"
 
 @node Música vocal
 @section Música vocal
@@ -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."

diff --git a/Documentation/fr/notation/vocal.itely b/Documentation/fr/notation/vocal.itely
index 1bea70ebdd126c683562957d9e0f1731a3650f8f..c5d18b9d565b0747a3ad54f897d721ba52e48841 100644 (file)
--- a/Documentation/fr/notation/vocal.itely
+++ b/Documentation/fr/notation/vocal.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.19"
 
 @c Translators: Valentin Villenave, Jean-Charles Malahieude
 @c Translation checkers: Jean-Jacques Gerbaud
@@ -2065,7 +2065,7 @@ text = \lyricmode {
           "Je me suis fait sécher..."
         }
       }
-      \vspace #0.1 % ajout d'espace vertical entre les couplets
+      \combine \null \vspace #0.1 % ajout d'espace vertical entre les couplets
       \line { \bold "3."
         \column {
           "Chante, rossignol, chante,"
@@ -2081,7 +2081,7 @@ text = \lyricmode {
           "Sans l'avoir mérité..."
         }
       }
-      \vspace #0.1 % ajout d'espace vertical entre les couplets
+      \combine \null \vspace #0.1 % ajout d'espace vertical entre les couplets
       \line { \bold "5."
         \column {
           "Je voudrais que la rose"

diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely
index 884b10e50f7a06c163cf7cef7ab86ae533b01798..dff6c23f670ac84a96904487355dd667a787fb69 100644 (file)
--- a/Documentation/ja/notation/vocal.itely
+++ b/Documentation/ja/notation/vocal.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.19"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -2025,7 +2025,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
-      \vspace #0.1 % 次の歌詞との間に垂直方向のスペースを入れます
+      \combine \null \vspace #0.1 % 次の歌詞との間に垂直方向のスペースを入れます
       \line { \bold "3."
         \column {
           "This is verse three."
@@ -2041,7 +2041,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
-      \vspace #0.1 % 次の歌詞との間に垂直方向のスペースを入れます
+      \combine \null \vspace #0.1 % 次の歌詞との間に垂直方向のスペースを入れます
       \line { \bold "5."
         \column {
           "This is verse five."

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 54a656959183fa54feaadf145adb0b7c11bb0c2d..3d082ce8293da5e1d0e8c79097f905fd78928ec8 100644 (file)
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.19"
 
 @node Vocal music
 @section Vocal music
@@ -2009,7 +2009,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."
@@ -2025,7 +2025,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."

diff --git a/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly b/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
index 488eaef84c8fad7f6264d20931eee413480d9060..ca6a3ac017c8d5f4a5cf11912a1d2ab2be66c24c 100644 (file)
--- a/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
+++ b/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.19"
 
 \header {
   lsrtags = "paper-and-layout, staff-notation, syntax-and-expressions"
@@ -338,7 +338,7 @@ chromaticBach =
         \header {
                 title = \markup
                            \column {
-                             \vspace #1
+                             \combine \null \vspace #1
                              "Exercise: Improve the given choral"
                              " "
                             }

diff --git a/input/regression/markup-note-styles.ly b/input/regression/markup-note-styles.ly
index c24c6d43b7d3d41c474313c6a6a868e7731845c2..224eaf69d0886fbdc3415874fc4227004ecdc690 100644 (file)
--- a/input/regression/markup-note-styles.ly
+++ b/input/regression/markup-note-styles.ly
@@ -1,4 +1,4 @@
-\version "2.17.12"
+\version "2.17.19"
 
 \header {
   texidoc = "@code{\\note-by-number} and @code{\\note} support
@@ -37,7 +37,7 @@ all note head styles and straight flags."
 
 \markup {
   \column {
-    \vspace #1
+    \combine \null \vspace #1
     \underline "Note-head-styles:"
     \override #'(baseline-skip . 6)
     \show-note-styles #styles-list
@@ -46,7 +46,7 @@ all note head styles and straight flags."
 
 \markup {
   \column {
-    \vspace #1
+    \combine \null \vspace #1
     \underline "Modern-straight-flag:"
     \override #'(flag-style . modern-straight-flag)
     \show-note-styles #'(default)
@@ -55,7 +55,7 @@ all note head styles and straight flags."
 
 \markup {
   \column {
-    \vspace #1
+    \combine \null \vspace #1
     \underline "Old-straight-flag:"
     \override #'(flag-style . old-straight-flag)
     \show-note-styles #'(default)

diff --git a/input/regression/markup-rest.ly b/input/regression/markup-rest.ly
index 593a3ea276262311b77f83b97e98d2ef3504645f..3c4895df9df883065bee7578c21eedbbd35f275e 100644 (file)
--- a/input/regression/markup-rest.ly
+++ b/input/regression/markup-rest.ly
@@ -1,4 +1,4 @@
-\version "2.17.9"
+\version "2.17.19"
 
 \header {
   texidoc = "The rest markup function works for a variety of style, dot and
@@ -81,10 +81,10 @@ showMultiMeasureRests =
            semipetrucci
            kievan)))))
 
-\markup \column { \bold "Simple Rests" \vspace #0.1 }
+\markup \column { \bold "Simple Rests" \combine \null \vspace #0.1 }
 
 \showSimpleRest #"."
 
-\markup \column { \vspace #0.1 \bold "MultiMeasureRests" \vspace #0.1 }
+\markup \column { \combine \null \vspace #0.1 \bold "MultiMeasureRests" \combine \null \vspace #0.1 }
 
 \showMultiMeasureRests

diff --git a/input/regression/markup-special-characters.ly b/input/regression/markup-special-characters.ly
index 8d3f2ce58f3c94b68e80a4f42f5e9df89e161852..b65a6f728eb8646e1ae5939b1d3eb666d3618ce6 100644 (file)
--- a/input/regression/markup-special-characters.ly
+++ b/input/regression/markup-special-characters.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.19"
 \header {
   texidoc = "
   A list of special character ASCII aliases can be easily included.
@@ -21,7 +21,7 @@
   \italic \justify {
     №2 – &OE;dipe…
   }
-  \vspace #0.5
+  \combine \null \vspace #0.5
   \bold "Lyric example:"
 }
 \new Lyrics \lyricmode {