From 1fb4227e7ca3d68dd4a775ff3f5095d8f4aa9d72 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sun, 26 May 2013 00:59:18 +0200 Subject: [PATCH] Run scripts/auxiliar/update-with-convert-ly.sh --- Documentation/de/notation/vocal.itely | 6 +++--- Documentation/es/notation/vocal.itely | 6 +++--- Documentation/fr/notation/vocal.itely | 6 +++--- Documentation/ja/notation/vocal.itely | 6 +++--- Documentation/notation/vocal.itely | 6 +++--- ...igned-staffgroups-without-connecting-systemstartbar.ly | 4 ++-- input/regression/markup-note-styles.ly | 8 ++++---- input/regression/markup-rest.ly | 6 +++--- input/regression/markup-special-characters.ly | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely index 2a9bf9157a..858db18da0 100644 --- 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 12b63fd7b0..e48b69ea6d 100644 --- 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 1bea70ebdd..c5d18b9d56 100644 --- 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 884b10e50f..dff6c23f67 100644 --- 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 54a6569591..3d082ce829 100644 --- 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 488eaef84c..ca6a3ac017 100644 --- 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 c24c6d43b7..224eaf69d0 100644 --- 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 593a3ea276..3c4895df9d 100644 --- 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 8d3f2ce58f..b65a6f728e 100644 --- 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 { -- 2.39.5