From 5178fc01c82223a2fa1a7dbbce55772022612210 Mon Sep 17 00:00:00 2001 From: Paul Morris Date: Wed, 10 Jun 2015 00:58:48 -0400 Subject: [PATCH] Issue 4418/4 run scripts/auxiliar/update-with-convert-ly.sh --- Documentation/de/notation/rhythms.itely | 6 +++--- Documentation/es/notation/rhythms.itely | 6 +++--- Documentation/fr/notation/rhythms.itely | 6 +++--- Documentation/it/notation/rhythms.itely | 6 +++--- Documentation/ja/notation/rhythms.itely | 6 +++--- Documentation/notation/rhythms.itely | 6 +++--- .../blanking-staff-lines-using-the--whiteout-command.ly | 8 ++++---- Documentation/snippets/using-the-whiteout-property.ly | 4 ++-- input/regression/markup-syntax.ly | 4 ++-- input/regression/whiteout-lower-layers.ly | 4 ++-- input/regression/whiteout.ly | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index 6f4f642df7..5b43b7edca 100644 --- a/Documentation/de/notation/rhythms.itely +++ b/Documentation/de/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala @@ -572,8 +572,8 @@ Objekten im Notensystem zusammenstoßen. \override Tie.layer = #-2 \override Staff.TimeSignature.layer = #-1 \override Staff.KeySignature.layer = #-1 -\override Staff.TimeSignature.whiteout = ##t -\override Staff.KeySignature.whiteout = ##t +\override Staff.TimeSignature.whiteout-box = ##t +\override Staff.KeySignature.whiteout-box = ##t b2 b~ \time 3/4 \key a \major diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index 46c091ead7..d44c2a0d61 100644 --- a/Documentation/es/notation/rhythms.itely +++ b/Documentation/es/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Duraciones @section Duraciones @@ -575,8 +575,8 @@ objetos del pentagrama. \override Tie.layer = #-2 \override Staff.TimeSignature.layer = #-1 \override Staff.KeySignature.layer = #-1 -\override Staff.TimeSignature.whiteout = ##t -\override Staff.KeySignature.whiteout = ##t +\override Staff.TimeSignature.whiteout-box = ##t +\override Staff.KeySignature.whiteout-box = ##t b2 b~ \time 3/4 \key a \major diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index 337364952f..4baa45f93c 100644 --- a/Documentation/fr/notation/rhythms.itely +++ b/Documentation/fr/notation/rhythms.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude @c Translation checkers: Valentin Villenave, François Martin, Xavier Scheuer @@ -586,8 +586,8 @@ permet d'obtenir une meilleure lisibilité. \override Tie.layer = #-2 \override Staff.TimeSignature.layer = #-1 \override Staff.KeySignature.layer = #-1 -\override Staff.TimeSignature.whiteout = ##t -\override Staff.KeySignature.whiteout = ##t +\override Staff.TimeSignature.whiteout-box = ##t +\override Staff.KeySignature.whiteout-box = ##t b2 b~ \time 3/4 \key a \major diff --git a/Documentation/it/notation/rhythms.itely b/Documentation/it/notation/rhythms.itely index ff76867748..c85f3cdf87 100644 --- a/Documentation/it/notation/rhythms.itely +++ b/Documentation/it/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Federico Bruni @c Translation checkers: Luca Rossetto Casel @@ -571,8 +571,8 @@ le proprietà di formattazione @var{whiteout} e @var{layer}. \override Tie.layer = #-2 \override Staff.TimeSignature.layer = #-1 \override Staff.KeySignature.layer = #-1 -\override Staff.TimeSignature.whiteout = ##t -\override Staff.KeySignature.whiteout = ##t +\override Staff.TimeSignature.whiteout-box = ##t +\override Staff.KeySignature.whiteout-box = ##t b2 b~ \time 3/4 \key a \major diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index 3aa374d61e..87d500353a 100644 --- a/Documentation/ja/notation/rhythms.itely +++ b/Documentation/ja/notation/rhythms.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -541,8 +541,8 @@ c2 ~ 2 \override Tie.layer = #-2 \override Staff.TimeSignature.layer = #-1 \override Staff.KeySignature.layer = #-1 -\override Staff.TimeSignature.whiteout = ##t -\override Staff.KeySignature.whiteout = ##t +\override Staff.TimeSignature.whiteout-box = ##t +\override Staff.KeySignature.whiteout-box = ##t b2 b~ \time 3/4 \key a \major diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index 9418c122aa..fbfca6e8f9 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Rhythms @section Rhythms @@ -558,8 +558,8 @@ collide with other objects in a staff. \override Tie.layer = #-2 \override Staff.TimeSignature.layer = #-1 \override Staff.KeySignature.layer = #-1 -\override Staff.TimeSignature.whiteout = ##t -\override Staff.KeySignature.whiteout = ##t +\override Staff.TimeSignature.whiteout-box = ##t +\override Staff.KeySignature.whiteout-box = ##t b2 b~ \time 3/4 \key a \major diff --git a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly index 6e49f9e5ec..e45a731d09 100644 --- a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly +++ b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly @@ -4,18 +4,18 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "editorial-annotations, really-cool, text" texidoc = " -The @code{\\whiteout} command underlays a markup with a white box. +The @code{\\whiteout-box} command underlays a markup with a white box. Since staff lines are in a lower layer than most other grobs, this white box will not overlap any other grob. " - doctitle = "Blanking staff lines using the \\whiteout command" + doctitle = "Blanking staff lines using the \\whiteout-box command" } % begin verbatim \layout { @@ -24,5 +24,5 @@ white box will not overlap any other grob. \relative c' { \override TextScript.extra-offset = #'(2 . 4) - c2-\markup { \whiteout \pad-markup #0.5 "middle C" } c + c2-\markup { \whiteout-box \pad-markup #0.5 "middle C" } c } diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly index c6c0721724..4b19433495 100644 --- a/Documentation/snippets/using-the-whiteout-property.ly +++ b/Documentation/snippets/using-the-whiteout-property.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "editorial-annotations, expressive-marks" @@ -33,7 +33,7 @@ is not masked. \override Score.StaffSymbol.layer = #4 \override Staff.TimeSignature.layer = #3 b'2 b'~ - \once \override Staff.TimeSignature.whiteout = ##t + \once \override Staff.TimeSignature.whiteout-box = ##t \time 3/4 b' r4 } diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly index dc56d260ac..8d737dce8b 100644 --- a/input/regression/markup-syntax.ly +++ b/input/regression/markup-syntax.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.22" \header { texidoc = "Demo of markup texts, using LilyPond syntax." @@ -40,7 +40,7 @@ \italic Norsk \super "2" " " - \raise #3.0 \whiteout white-out + \raise #3.0 \whiteout-box white-out \circle \dynamic p \with-color #green Green \dynamic sfzp diff --git a/input/regression/whiteout-lower-layers.ly b/input/regression/whiteout-lower-layers.ly index a7284b9918..ecc75aef09 100644 --- a/input/regression/whiteout-lower-layers.ly +++ b/input/regression/whiteout-lower-layers.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header { texidoc = "If the 'whiteout property of a grob is set to #t, that part of all objects in lower @@ -13,7 +13,7 @@ Tie but not the StaffSymbol. \override Staff.StaffSymbol.layer = #4 \once \override Tie.layer = #2 b'2.~ - \once \override Staff.TimeSignature.whiteout = ##t + \once \override Staff.TimeSignature.whiteout-box = ##t \once \override Staff.TimeSignature.layer = #3 \time 5/4 b4 diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly index def544c1b6..b450f3bb7a 100644 --- a/input/regression/whiteout.ly +++ b/input/regression/whiteout.ly @@ -4,7 +4,7 @@ markup. " } -\version "2.19.21" +\version "2.19.22" \paper { @@ -14,5 +14,5 @@ markup. " \relative { \override TextScript.layer = #'2 \override TextScript.extra-offset = #'(2 . 4) - c''4-\markup { \whiteout \pad-markup #0.5 foo } c + c''4-\markup { \whiteout-box \pad-markup #0.5 foo } c } -- 2.39.2