diff options
author | John Mandereau <john.mandereau@gmail.com> | 2008-01-27 16:28:24 +0100 |
---|---|---|
committer | John Mandereau <john.mandereau@gmail.com> | 2008-01-27 16:28:24 +0100 |
commit | 1286ff466cd2da763a5f446312d45a9a396001c2 (patch) | |
tree | 7945216d6daab04648d9df21b0f8a5fd59d29828 | |
parent | 35b74bed55ffa5630fa08fc7701b567fd4bce630 (diff) |
Run convert-ly and update manual for syntax changes
70 files changed, 233 insertions, 227 deletions
diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/user/ancient.itely index 9b0162fa0c..485440b494 100644 --- a/Documentation/de/user/ancient.itely +++ b/Documentation/de/user/ancient.itely @@ -179,7 +179,7 @@ und Versetzungszeichen für die Alte Musik ausgewählt werden. @lilypond[quote,ragged-right,staffsize=26] \score { { - \fatText + \textLengthOn s^\markup { \column { "vaticana" @@ -621,7 +621,7 @@ Im folgenden Beispiel sind die unterschiedlichen Stile dargestellt. @lilypond[ragged-right,fragment,relative=1,quote] { - \fatText + \textLengthOn \time 2/2 c1^\markup { \hspace #-2.0 \typewriter default } diff --git a/Documentation/de/user/putting.itely b/Documentation/de/user/putting.itely index 9097a10fe9..54dc2e3893 100644 --- a/Documentation/de/user/putting.itely +++ b/Documentation/de/user/putting.itely @@ -36,7 +36,7 @@ Cello notieren. In diesem Fall beginnen Sie mit @qq{Noten und Text} (für die Sopranstimme). @example -\version "2.11.23" +\version "2.11.38" melodie = \relative c' @{ \clef treble \key c \major @@ -66,7 +66,7 @@ Jetzt wollen wir die Cellostimme hinzufügen. Schauen wir uns das @qq{Nur Noten}-Beispiel an: @example -\version "2.11.23" +\version "2.11.38" melodie = \relative c' @{ \clef treble \key c \major @@ -106,7 +106,7 @@ Wir setzen hier auch ein paar andere Noten für das Cello. @example -\version "2.11.23" +\version "2.11.38" sopranNoten = \relative c' @{ \clef treble \key c \major @@ -181,7 +181,7 @@ Unordnung geraden. Aber das ist einfach wieder hergestellt. Hier die vollständige Vorlage für Sopran und Cello: @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" sopranoMusic = \relative c' { \clef treble \key c \major diff --git a/Documentation/de/user/templates.itely b/Documentation/de/user/templates.itely index a6a3e26191..944816c222 100644 --- a/Documentation/de/user/templates.itely +++ b/Documentation/de/user/templates.itely @@ -37,7 +37,7 @@ Sie es in Ihre Datei ein, schreiben Sie die Noten hinzu, und Sie haben eine vollständige Notationsdatei. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -64,7 +64,7 @@ Wenn Sie die Balken wieder einschalten wollen, müssen Sie die entsprechende Zeile entweder ändern oder auskommentieren. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -96,7 +96,7 @@ Wollen Sie ein Liedblatt mit Melodie und Akkorden schreiben? Hier ist das richtige Beispiel für Sie! @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -130,7 +130,7 @@ Mit diesem Beispiel können Sie einen Song mit Melodie, Text und Akkorden schreiben. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -171,7 +171,7 @@ harmonies = \chordmode { Hier kommt ein einfaches Klaviersystem. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -205,7 +205,7 @@ Das nächste Beispiel ist typisch für ein Lied: Im oberen System die Melodie mit Text, darunter Klavierbegleitung. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c'' { \clef treble \key c \major @@ -262,7 +262,7 @@ Sie den Text auch zwischen die beiden Klaviersysteme schreiben (und damit das zusätzliche System für die Gesangstimme auslassen). @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -309,7 +309,7 @@ etwas anpassen, aber Sie können ja das angepasste Beispiel von hier kopieren. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -405,7 +405,7 @@ wird auch eine @qq{@code{\global}}-Variable für Taktart und Vorzeichen benutzt. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global= { \time 4/4 @@ -469,7 +469,7 @@ zugewiesen, auf den zurückgegriffen werden kann. @verbatim %%%%% piece.ly -\version "2.11.23" +\version "2.11.38" global= { \time 4/4 @@ -515,7 +515,7 @@ music = { %%%%% score.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" #(set-global-staff-size 14) \score { @@ -526,7 +526,7 @@ music = { %%%%% vn1.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vn1 \music @@ -535,7 +535,7 @@ music = { %%%%% vn2.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vn2 \music @@ -544,7 +544,7 @@ music = { %%%%% vla.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vla \music @@ -553,7 +553,7 @@ music = { %%%%% vlc.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vlc \music @@ -573,7 +573,7 @@ die in allen Stimmen eingefügt wird. Taktart und Vorzeichen etwa sind fast immer gleich in allen Stimmen. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -654,7 +654,7 @@ irgendeine Änderung an einer Chorstimme vornehmen, (etwa tenorMusic), verändert sich auch der Klavierauszug entsprechend. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -748,7 +748,7 @@ In diesem Beispiel werden die Texte mit den Befehlen über und unter dem System angeordnet. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -873,7 +873,7 @@ ein Kompromiss werden die Notenlinien nicht auf dem System, sondern zwischen den Systemen geschrieben. @lilypond[quote,verbatim,line-width=11.0\cm] -\version "2.11.23" +\version "2.11.38" global = { \set Score.skipBars = ##t @@ -1114,7 +1114,7 @@ Länge von Pausen an. @lilypond[quote,verbatim,ragged-right] \include "gregorian-init.ly" -\version "2.11.23" +\version "2.11.38" chant = \relative c' { \set Score.timing = ##f @@ -1174,7 +1174,7 @@ sich die Noten innerhalb eines @code{\transpose}-Abschnitts befinden. @c The `line-width' argument is for the \header. @lilypond[quote,verbatim,ragged-right,line-width] -\version "2.11.23" +\version "2.11.38" \header { title = "Song" subtitle = "(tune)" @@ -1450,7 +1450,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @ The `line-width' is for \header. @li lypond[quote,verbatim,ragged-right,line-width] -\version "2.11.23" +\version "2.11.38" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/user/tutorial.itely index 529a1f57c9..6c63e4d38d 100644 --- a/Documentation/de/user/tutorial.itely +++ b/Documentation/de/user/tutorial.itely @@ -1667,7 +1667,7 @@ Der @code{\version}-Befehl zeigt an, welche LilyPond-Version für eine bestimmte Quelldatei benutzt worden ist: @example -\version "2.11.23" +\version "2.11.38" @end example @noindent @@ -1689,7 +1689,7 @@ außerhalb der musikalischen Ausdrücke, meistens wird die @code{\header}-Umgebung direkt nach der Versionsnummer eingefügt. @example -\version "2.11.23" +\version "2.11.38" \header @{ title = "Symphony" composer = "Ich" diff --git a/Documentation/de/user/working.itely b/Documentation/de/user/working.itely index acd4be3d15..35cc3575cc 100644 --- a/Documentation/de/user/working.itely +++ b/Documentation/de/user/working.itely @@ -73,7 +73,7 @@ Hier einige Vorschläge, wie Sie Probleme vermeiden oder lösen können: @item @strong{Schreiben Sie immer mit @code{\version} die Versionsnummer in jede Datei}. Beachten Sie, dass in allen Vorlagen die Versionsnummer -@code{\version "2.11.23"} eingetragen ist. Es empfielt sich, in alle +@code{\version "2.11.38"} eingetragen ist. Es empfielt sich, in alle Dateien, unabhängig von ihrer Größe, den @code{\version}-Befehl einzufügen. Persönliche Erfahrung hat gezeigt, dass es ziemlich frustrierend sein kann zu erinnern, welche Programmversion man etwa @@ -556,7 +556,7 @@ für meine Projekte. Jede Notationsdatei fängt an mit @example %%% global.ly -\version "2.11.23" +\version "2.11.38" #(ly:set-option 'point-and-click #f) \include "../init/init-defs.ly" \include "../init/init-layout.ly" diff --git a/Documentation/es/user/ancient.itely b/Documentation/es/user/ancient.itely index b28bfc096d..b4494b3470 100644 --- a/Documentation/es/user/ancient.itely +++ b/Documentation/es/user/ancient.itely @@ -172,7 +172,7 @@ los símbolos de alteración de la notación antigua. @lilypond[quote,ragged-right,staffsize=26] \score { { - \fatText + \textLengthOn s^\markup { \column { "vaticana" @@ -609,7 +609,7 @@ Los ejemplos siguientes muestran las diferencias que existen entre los estilos: @lilypond[ragged-right,fragment,relative=1,quote] { - \fatText + \textLengthOn \time 2/2 c1^\markup { \hspace #-2.0 \typewriter default } diff --git a/Documentation/es/user/educational.itely b/Documentation/es/user/educational.itely index 42d5ebcb9d..9e79e0c440 100644 --- a/Documentation/es/user/educational.itely +++ b/Documentation/es/user/educational.itely @@ -38,19 +38,19 @@ Las cabezas @q{easy play} (fáciles de tocar) tienen el nombre de la nota (en in en la música para principiantes @lilypond[quote,ragged-right,verbatim,fragment,staffsize=26] - \setEasyHeads + \easyHeadsOn c'2 e'4 f' | g'1 @end lilypond -La orden @code{\setEasyHeads} sobreescribe los ajustes del objeto +La orden @code{\easyHeadsOn} sobreescribe los ajustes del objeto @internalsref{NoteHead}. Para que las letras sean legibles, se tienen que imprimir en un tamaño grande de la tipografía. Para imprimir con un tamaño de tipografía mayor, consulte @ref{Setting the staff size}. @refcommands -@funindex \setEasyHeads -@code{\setEasyHeads} +@funindex \easyHeadsOn +@code{\easyHeadsOn} @node Shape note heads diff --git a/Documentation/es/user/putting.itely b/Documentation/es/user/putting.itely index c8841ca5df..ef18b28f86 100644 --- a/Documentation/es/user/putting.itely +++ b/Documentation/es/user/putting.itely @@ -35,7 +35,7 @@ En este caso comenzaríamos con la plantilla @q{Notas y letra} (para la parte de soprano). @example -\version "2.11.23" +\version "2.11.38" melodia = \relative c' @{ \clef treble \key c \major @@ -64,7 +64,7 @@ texto = \lyricmode @{ Ahora queremos añadir una parte de violoncello. Veamos el ejemplo @q{Sólo notas}: @example -\version "2.11.23" +\version "2.11.38" melodia = \relative c' @{ \clef treble \key c \major @@ -100,7 +100,7 @@ se escriben normalmente en clave de Fa). Asimismo, cambiaremos algunas notas del cello. @example -\version "2.11.23" +\version "2.11.38" musicaSoprano = \relative c' @{ \clef treble \key c \major @@ -170,7 +170,7 @@ Esto parece un poco enrevesado; los márgenes están descuadrados. Esto tiene fácil solución. Presentamos aquí la plantilla completa para soprano y cello. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" sopranoMusic = \relative c' { \clef treble \key c \major diff --git a/Documentation/es/user/templates.itely b/Documentation/es/user/templates.itely index 7d1371a9ad..05d3719609 100644 --- a/Documentation/es/user/templates.itely +++ b/Documentation/es/user/templates.itely @@ -35,7 +35,7 @@ solista o un fragmento melódico. Córtelo y péguelo en un archivo, escriba las notas y ¡ha terminado! @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -60,7 +60,7 @@ barrado automático, tendrá que cambiar o convertir en un comentario la línea correspondiente. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -91,7 +91,7 @@ text = \lyricmode { ¿Quiere preparar una «lead sheet» u hoja guía de una canción con acordes? ¡No busque más! @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -124,7 +124,7 @@ harmonies = \chordmode { Esta plantilla le permite preparar una canción con melodía, letra y acordes. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -165,7 +165,7 @@ harmonies = \chordmode { He aquí un sencillo sistema de piano. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -199,7 +199,7 @@ Aquí tenemos el típico formato de canción: un pentagrama con la melodía y la acompañamiento de piano. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c'' { \clef treble \key c \major @@ -255,7 +255,7 @@ En lugar de tener un pentagrama dedicado a la melodía y la letra puede colocar la letra en medio de los pentagramas del piano (y omitir el pentagrama separado para la melodía). @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -302,7 +302,7 @@ ya que la plantilla está aquí mismo, no tiene que hacer el trucaje usted mismo. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -397,7 +397,7 @@ Esta plantilla es una demostración de un cuarteto de cuerda. También usa una para las indicaciones del compás y de la armadura de la tonalidad. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global= { \time 4/4 @@ -457,7 +457,7 @@ contiene todas las definiciones musicales. Los otros archivos (@code{score.ly}, @verbatim %%%%% piece.ly -\version "2.11.23" +\version "2.11.38" global= { \time 4/4 @@ -503,7 +503,7 @@ music = { %%%%% score.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" #(set-global-staff-size 14) \score { @@ -514,7 +514,7 @@ music = { %%%%% vn1.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vn1 \music @@ -523,7 +523,7 @@ music = { %%%%% vn2.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vn2 \music @@ -532,7 +532,7 @@ music = { %%%%% vla.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vla \music @@ -541,7 +541,7 @@ music = { %%%%% vlc.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vlc \music @@ -561,7 +561,7 @@ Por ejemplo, la indicación de compás y la armadura de la tonalidad son casi si para todas las partes. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -642,7 +642,7 @@ usar una definición musical más de una vez. Si hace algún cambio en las nota reducción de piano. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -735,7 +735,7 @@ Aquí todas las líneas de texto se colocan usando @code{alignAboveContext} y @code{alignBelowContext}. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -859,7 +859,7 @@ A modo de compromiso, las líneas de compás se suelen imprimir entre los pentag en vez de hacerlo sobre ellos. @lilypond[quote,verbatim,line-width=11.0\cm] -\version "2.11.23" +\version "2.11.38" global = { \set Score.skipBars = ##t @@ -1099,7 +1099,7 @@ nota de blanca y negra, y marcas especiales que indican silencios de distinta lo @lilypond[quote,verbatim,ragged-right] \include "gregorian-init.ly" -\version "2.11.23" +\version "2.11.38" chant = \relative c' { \set Score.timing = ##f @@ -1159,7 +1159,7 @@ sección @code{\transpose}. @c The `line-width' argument is for the \header. @lilypond[quote,verbatim,ragged-right,line-width] -\version "2.11.23" +\version "2.11.38" \header { title = "Song" subtitle = "(tune)" @@ -1435,7 +1435,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @ The `line-width' is for \header. @li lypond[quote,verbatim,ragged-right,line-width] -\version "2.11.23" +\version "2.11.38" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely index 7d2160bbd6..268cd5181f 100644 --- a/Documentation/es/user/text.itely +++ b/Documentation/es/user/text.itely @@ -61,14 +61,14 @@ c'4^\markup { bla \bold bla } Es posible colocar cadenas de texto arbitrarias o @ref{Text markup}, encima o debajo de las notas utilizando una cadena @code{c^"texto"}. Por omisión, estas indicaciones no influyen sobre el espaciado de las notas, pero si se utiliza la -instrucción @code{\fatText}, las anchuras se tendrán en cuenta +instrucción @code{\textLengthOn}, las anchuras se tendrán en cuenta @lilypond[quote,fragment,ragged-right,verbatim,relative=1] -c4^"longtext" \fatText c4_"longlongtext" c4 +c4^"longtext" \textLengthOn c4_"longlongtext" c4 @end lilypond @noindent -Para evitar que el texto influya sobre el espaciado, utilice @code{\emptyText}. +Para evitar que el texto influya sobre el espaciado, utilice @code{\textLengthOff}. También se pueden añadir a una nota textos con un formato más complejo utilizando la orden markup (marcado), @@ -83,10 +83,10 @@ La instrucción @code{\markup} se describe con más detalle en @refcommands -@funindex \fatText -@code{\fatText}, -@funindex \emptyText -@code{\emptyText}. +@funindex \textLengthOn +@code{\textLengthOn}, +@funindex \textLengthOff +@code{\textLengthOff}. @commonprop @@ -126,7 +126,7 @@ aplicarles ajustes finos. @lilypond[relative=2,ragged-right,verbatim,fragment] d2 \glissando d'2 -\once \override Glissando #'dash-fraction = #0.5 +\once \override Glissando #'style = #'dashed-line d,2 \glissando d'2 \override Glissando #'style = #'dotted-line d,2 \glissando d'2 @@ -280,7 +280,7 @@ c2\startTextSpan b c\stopTextSpan a Para imprimir una línea continua, use @example -\override TextSpanner #'dash-fraction = #'() +\override TextSpanner #'style = #'line @end example @@ -582,7 +582,7 @@ Para dejar separadas las listas de palabras, podemos utilizar comillas @code{"} orden @code{\line} @lilypond[quote,verbatim,fragment,relative=1] -\fatText +\textLengthOn c4^\markup{ \center-align { on three lines } } c4^\markup{ \center-align { "all one line" } } c4^\markup{ \center-align { { on three lines } } } @@ -608,7 +608,7 @@ tenemos que usar la propiedad de relleno #'padding o crear un punto de @q{anclaj dentro del elemento de marcado (generalmente con @code{\hspace #0}). @lilypond[quote,verbatim,fragment,relative=1] -\fatText +\textLengthOn c'4^\markup{ \raise #5 "not raised" } \once \override TextScript #'padding = #3 c'4^\markup{ raised } diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/user/tutorial.itely index 3f0b57adc5..920d0d4eb8 100644 --- a/Documentation/es/user/tutorial.itely +++ b/Documentation/es/user/tutorial.itely @@ -1284,7 +1284,7 @@ La indicación @code{\version} deja registrado para qué versión de LilyPond se el archivo: @example -\version "2.11.23" +\version "2.11.38" @end example @noindent @@ -1305,7 +1305,7 @@ principal; el bloque @code{\header} normalmente se sitúa por debajo del @ruser{Version number}. @example -\version "2.11.23" +\version "2.11.38" \header @{ title = "Symphony" composer = "Me" diff --git a/Documentation/es/user/working.itely b/Documentation/es/user/working.itely index 3d14b2e9c7..76ddd8f333 100644 --- a/Documentation/es/user/working.itely +++ b/Documentation/es/user/working.itely @@ -70,7 +70,7 @@ o corregir problemas: @itemize @bullet @item @strong{Incluya los números de @code{\version} en todos los archivos}. Dese cuenta de que todas las -plantillas contienen una cadena como @code{\version "2.11.23"}. Le recomendamos +plantillas contienen una cadena como @code{\version "2.11.38"}. Le recomendamos mucho que siempre incluya la @code{\version}, sin importar cuán pequeño pueda ser su archivo. Desde la experiencia personal podemos decirle que es bastante frustrante intentar recordar el número de versión de LilyPond que estaba usando hace unos años. @@ -537,7 +537,7 @@ Yo utilizo media docena de archivos de @example %%% global.ly -\version "2.11.23" +\version "2.11.38" #(ly:set-option 'point-and-click #f) \include "../iniciar/iniciar-definiciones.ly" \include "../iniciar/iniciar-disposicion.ly" diff --git a/Documentation/fr/user/ancient.itely b/Documentation/fr/user/ancient.itely index 32ec87c76d..768671c422 100644 --- a/Documentation/fr/user/ancient.itely +++ b/Documentation/fr/user/ancient.itely @@ -174,7 +174,7 @@ et @internalsref{KeySignature}. @lilypond[quote,ragged-right,staffsize=26] \score { { - \fatText + \textLengthOn s^\markup { \column { "vaticana" @@ -612,7 +612,7 @@ Voici les différences entre les styles : @lilypond[ragged-right,fragment,relative=1,quote] { - \fatText + \textLengthOn \time 2/2 c1^\markup { \hspace #-2.0 \typewriter default } diff --git a/Documentation/fr/user/educational.itely b/Documentation/fr/user/educational.itely index 053819e149..9b39c56481 100644 --- a/Documentation/fr/user/educational.itely +++ b/Documentation/fr/user/educational.itely @@ -37,19 +37,19 @@ Les notes @q{easy play} comportent le nom de la note à l'intérieur de la tête. On l'utilise dans des partitions pour débutants. @lilypond[quote,ragged-right,verbatim,fragment,staffsize=26] - \setEasyHeads + \easyHeadsOn c'2 e'4 f' | g'1 @end lilypond -La commande @code{\setEasyHeads} remplace tous les réglages de l'objet +La commande @code{\easyHeadsOn} remplace tous les réglages de l'objet @internalsref{NoteHead}. L'impression doit être de plus grande taille, afin que les lettres soient lisibles. Voir à ce propos @ref{Setting the staff size}. @refcommands -@funindex \setEasyHeads -@code{\setEasyHeads} +@funindex \easyHeadsOn +@code{\easyHeadsOn} @node Shape note heads diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely index 6ad387deb1..9f65c9054e 100644 --- a/Documentation/fr/user/fundamental.itely +++ b/Documentation/fr/user/fundamental.itely @@ -702,7 +702,7 @@ pour soprano et violoncelle : dans ce cas l'on pourrait commencer par les @qq{notes et paroles}, pour la partie de soprano. @example -\version "2.11.23" +\version "2.11.38" melodie = \relative c' @{ \clef treble \key c \major @@ -732,7 +732,7 @@ Maintenant, on veut ajouter une partie de violoncelle. Jetons un coup d'oeil sur l'exemple avec les notes seules : @example -\version "2.11.23" +\version "2.11.38" melodie = \relative c' @{ \clef treble \key c \major @@ -770,7 +770,7 @@ Et puis, toujours tant qu'on y est, mettons le violoncelle en clé de Fa, comme le veut l'usage, et donnons-lui d'autres notes. @example -\version "2.11.23" +\version "2.11.38" musiqueSoprano = \relative c' @{ \clef treble \key c \major @@ -842,7 +842,7 @@ mettre un peu d'ordre dans l'indentation. Voici le modèle pour soprano et violoncelle au complet : @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" sopranoMusic = \relative c' { \clef treble \key c \major diff --git a/Documentation/fr/user/text.itely b/Documentation/fr/user/text.itely index 10ead3bb20..86e8e34758 100644 --- a/Documentation/fr/user/text.itely +++ b/Documentation/fr/user/text.itely @@ -67,14 +67,14 @@ Vous pouvez placer arbitrairement des chaînes de caractères, ou @ref{Text markup} en langage LilyPond, au dessus ou au dessous des notes en employant la syntaxe @code{c^"text"}. Par défaut, ces indications n'affecteront en rien l'espacement des notes, sauf à -utiliser la commande @code{\fatText}. +utiliser la commande @code{\textLengthOn}. @lilypond[quote,fragment,ragged-right,verbatim,relative=1] -c4^"longtext" \fatText c4_"longlongtext" c4 +c4^"longtext" \textLengthOn c4_"longlongtext" c4 @end lilypond @noindent -Pour revenir à l'espacement par défaut, utilisez @code{\emptyText}. +Pour revenir à l'espacement par défaut, utilisez @code{\textLengthOff}. Des constructions plus élaborées d'étiquette peuvent être obtenues en ayant recours à la commande @emph{markup} : @@ -89,10 +89,10 @@ La commande @code{\markup} est décrite plus en détails dans la section @refcommands -@funindex \fatText -@code{\fatText}, -@funindex \emptyText -@code{\emptyText}. +@funindex \textLengthOn +@code{\textLengthOn}, +@funindex \textLengthOff +@code{\textLengthOff}. @commonprop @@ -134,7 +134,7 @@ disponibles, ainsi que la manière de les personnaliser. @lilypond[relative=2,ragged-right,verbatim,fragment] d2 \glissando d'2 -\once \override Glissando #'dash-fraction = #0.5 +\once \override Glissando #'style = #'dashed-line d,2 \glissando d'2 \override Glissando #'style = #'dotted-line d,2 \glissando d'2 @@ -292,7 +292,7 @@ c2\startTextSpan b c\stopTextSpan a Pour obtenir une ligne pleine, utilisez @example -\override TextSpanner #'dash-fraction = #'() +\override TextSpanner #'style = #'line @end example @@ -608,7 +608,7 @@ L'utilisation des @code{"} ou de la commande @code{\line} permet de différencier les listes de mots. @lilypond[quote,verbatim,fragment,relative=1] -\fatText +\textLengthOn c4^\markup{ \center-align { on three lines } } c4^\markup{ \center-align { "all one line" } } c4^\markup{ \center-align { { on three lines } } } @@ -636,7 +636,7 @@ déplacer une étiquette, il vous faudra utiliser la propriété de l'étiquette (généralement avec @code{\hspace #0}). @lilypond[quote,verbatim,fragment,relative=1] -\fatText +\textLengthOn c'4^\markup{ \raise #5 "not raised" } \once \override TextScript #'padding = #3 c'4^\markup{ raised } diff --git a/Documentation/fr/user/tutorial.itely b/Documentation/fr/user/tutorial.itely index a10ba2edc3..46233483a3 100644 --- a/Documentation/fr/user/tutorial.itely +++ b/Documentation/fr/user/tutorial.itely @@ -1373,7 +1373,7 @@ La déclaration @code{\version} stipule le numéro de la version de LilyPond pour laquelle le fichier a été écrit, @example -\version "2.11.32" +\version "2.11.38" @end example @noindent @@ -1395,7 +1395,7 @@ qui existe indépendamment des expressions musicales principales. Le bloc @code{\header} est habituellement placé en début de fichier. @example -\version "2.11.32" +\version "2.11.38" \header @{ title = "Symphonie" composer = "Moi" diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/user/working.itely index 615bc3d63e..1625af305e 100644 --- a/Documentation/fr/user/working.itely +++ b/Documentation/fr/user/working.itely @@ -539,7 +539,7 @@ chaque fichier de musique par @code{\include "../global.ly"} qui contient : @example %%% global.ly -\version "2.11.32" +\version "2.11.38" #(ly:set-option 'point-and-click #f) \include "../init/init-defs.ly" \include "../init/init-mise-en-page.ly" diff --git a/Documentation/user/README.txt b/Documentation/user/README.txt index e38d7e86c5..6b39a974a3 100644 --- a/Documentation/user/README.txt +++ b/Documentation/user/README.txt @@ -13,6 +13,8 @@ convert-ly -e --from=... --to=... --no-version *.itely % to find the current version number, grep "version \"" tutorial.itely +Please don't forget updating translated docs (in LANGS/user) too! + % (nobody ever remembers to update this file, so I've stopped % trying to record it here) diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely index 21178ff6e9..aff177a54f 100644 --- a/Documentation/user/ancient.itely +++ b/Documentation/user/ancient.itely @@ -161,7 +161,7 @@ ancient accidentals. @lilypond[quote,ragged-right,staffsize=26] \score { { - \fatText + \textLengthOn s^\markup { \column { "vaticana" @@ -598,7 +598,7 @@ The following examples show the differences in style, @lilypond[ragged-right,fragment,relative=1,quote] { - \fatText + \textLengthOn \time 2/2 c1^\markup { \hspace #-2.0 \typewriter default } diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index 308cb478a2..8243f15958 100644 --- a/Documentation/user/fundamental.itely +++ b/Documentation/user/fundamental.itely @@ -40,7 +40,7 @@ description of the input format, see @ruser{File structure}. A basic example of a lilypond input file is @example -\version "2.11.23" +\version "2.11.38" \score @{ @var{...compound music expression...} % all the music goes here! \header @{ @} @@ -1734,7 +1734,7 @@ cello. In this case, we would start with @q{Notes and lyrics} (for the soprano part). @example -\version "2.11.23" +\version "2.11.38" melody = \relative c' @{ \clef treble \key c \major @@ -1762,7 +1762,7 @@ text = \lyricmode @{ Now we want to add a cello part. Let's look at the @q{Notes only} example: @example -\version "2.11.23" +\version "2.11.38" melody = \relative c' @{ \clef treble \key c \major @@ -1797,7 +1797,7 @@ normally use bass clef. We'll also give the cello some different notes. @example -\version "2.11.23" +\version "2.11.38" sopranoMusic = \relative c' @{ \clef treble \key c \major @@ -1866,7 +1866,7 @@ This looks a bit messy; the indentation is messed up now. That is easily fixed. Here's the complete soprano and cello template. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" sopranoMusic = \relative c' { \clef treble \key c \major @@ -1914,7 +1914,7 @@ from Handel's Messiah: @c The following should appear as music without code @lilypond[quote,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key d \major \time 4/4 } sopMusic = \relative c'' { \clef "treble" @@ -2088,7 +2088,7 @@ Combining all these together and adding the music for the three bars of the example above gives: @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key d \major \time 4/4 } sopMusic = \relative c'' { \clef "treble" @@ -2186,7 +2186,7 @@ music definitions and one to define the time signature and key: @example -\version "2.11.23" +\version "2.11.38" \header @{ title = "Jesu, meine Freude" composer = "J S Bach" @@ -2295,7 +2295,7 @@ may vary. All that remains now is to add the music, and combine all the parts together. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" \header { title = "Jesu, meine Freude" composer = "J S Bach" diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely index 76ae16f5cd..ae951d1583 100644 --- a/Documentation/user/pitches.itely +++ b/Documentation/user/pitches.itely @@ -933,7 +933,7 @@ clarinet. \key a \major \transposition a c d e f -\fatText +\textLengthOn r1^\markup{Switch to B\flat clarinet} \key bes \major @@ -1752,21 +1752,25 @@ It is used in music for beginners. @lilypond[verbatim,quote,ragged-right] #(set-global-staff-size 26) \relative c' { - \setEasyHeads + \easyHeadsOn c2 e4 f g1 + \easyHeadsOff + c,1 } @end lilypond -The command @code{\setEasyHeads} overrides settings for the -@code{NoteHead} object. To make the letters readable, it -has to be printed in a large font size. To print with a larger -font, see @ref{Setting the staff size}. +The command @code{\easyHeadsOn} overrides settings for the +@code{NoteHead} object. These settings can be reverted with the command +@code{\easyHeadsOff}. To make the letters readable, it has to be printed +in a large font size. To print with a larger font, see @ref{Setting the +staff size}. @refcommands -@funindex \setEasyHeads -@code{\setEasyHeads} +@funindex \easyHeadsOn +@funindex \easyHeadsOff +@code{\easyHeadsOn}, @code{\easyHeadsOff} @seealso diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index 238f41e5e2..2552746b8a 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -756,19 +756,19 @@ Text attached to a multi-measure rest will be centered above or below it. Long text attached in this way does not cause the measure to expand, and may collide with text in adjacent measures. Long text is better attached to a zero-length skip note preceding -the rest, preceded by @code{\fatText} (turn off again with -@code{\emptyText}), since this will cause the measure to expand to +the rest, preceded by @code{\textLengthOn} (turn off again with +@code{\textLengthOff}), since this will cause the measure to expand to accommodate the length of the text: @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \set Score.skipBars = ##t -\fatText +\textLengthOn s1*0^\markup {[MAJOR GENERAL]} R1*19 s1*0^\markup {[MABEL] } s1*0_\markup {\italic {Cue: ... it is yours}} R1*30 -\emptyText +\textLengthOff c4^\markup {CHORUS} d f c @end lilypond diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely index e57a04968e..a485ba4963 100644 --- a/Documentation/user/templates.itely +++ b/Documentation/user/templates.itely @@ -35,7 +35,7 @@ instrument or a melodic fragment. Cut and paste this into a file, add notes, and you're finished! @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -60,7 +60,7 @@ automatic beaming, you'll have to change or comment out the relevant line. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -91,7 +91,7 @@ text = \lyricmode { Want to prepare a lead sheet with a melody and chords? Look no further! @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -124,7 +124,7 @@ harmonies = \chordmode { This template allows you to prepare a song with melody, words, and chords. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c' { \clef treble \key c \major @@ -165,7 +165,7 @@ harmonies = \chordmode { Here is a simple piano staff. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -199,7 +199,7 @@ Here is a typical song format: one staff with the melody and lyrics, with piano accompaniment underneath. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" melody = \relative c'' { \clef treble \key c \major @@ -255,7 +255,7 @@ Instead of having a full staff for the melody and lyrics, you can place the lyrics between the piano staff (and omit the separate melody staff). @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -302,7 +302,7 @@ since the template is right here, you don't have to do the tweaking yourself. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" upper = \relative c'' { \clef treble \key c \major @@ -397,7 +397,7 @@ This template demonstrates a string quartet. It also uses a @code{\global} section for time and key signatures. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global= { \time 4/4 @@ -457,7 +457,7 @@ contains all the music definitions. The other files -- @code{score.ly}, @verbatim %%%%% piece.ly -\version "2.11.23" +\version "2.11.38" global= { \time 4/4 @@ -503,7 +503,7 @@ music = { %%%%% score.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" #(set-global-staff-size 14) \score { @@ -514,7 +514,7 @@ music = { %%%%% vn1.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vn1 \music @@ -523,7 +523,7 @@ music = { %%%%% vn2.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vn2 \music @@ -532,7 +532,7 @@ music = { %%%%% vla.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vla \music @@ -541,7 +541,7 @@ music = { %%%%% vlc.ly -\version "2.11.23" +\version "2.11.38" \include "piece.ly" \score { \keepWithTag #'vlc \music @@ -561,7 +561,7 @@ parts. For example, the time signature and key signatures are almost always the same for all parts. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -642,7 +642,7 @@ to the vocal notes (say, tenorMusic), then the changes will also apply to the piano reduction. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -735,7 +735,7 @@ Here all the lyrics lines are placed using @code{alignAboveContext} and @code{alignBelowContext}. @lilypond[quote,verbatim,ragged-right] -\version "2.11.23" +\version "2.11.38" global = { \key c \major \time 4/4 @@ -859,7 +859,7 @@ notes. As a compromise, bar lines are often printed between the staves rather than on the staves. @lilypond[quote,verbatim,line-width=11.0\cm] -\version "2.11.23" +\version "2.11.38" global = { \set Score.skipBars = ##t @@ -1099,7 +1099,7 @@ quarter note heads, and special marks, indicating rests of different length. @lilypond[quote,verbatim,ragged-right] \include "gregorian-init.ly" -\version "2.11.23" +\version "2.11.38" chant = \relative c' { \set Score.timing = ##f @@ -1159,7 +1159,7 @@ is within a @code{\transpose} section. @c The `line-width' argument is for the \header. @lilypond[quote,verbatim,ragged-right,line-width] -\version "2.11.23" +\version "2.11.38" \header { title = "Song" subtitle = "(tune)" @@ -1435,7 +1435,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @ The `line-width' is for \header. @li lypond[quote,verbatim,ragged-right,line-width] -\version "2.11.23" +\version "2.11.38" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index 265ddd9f26..71232c57be 100644 --- a/Documentation/user/text.itely +++ b/Documentation/user/text.itely @@ -96,15 +96,15 @@ Snippets: @lsrdir{text} It is possible to place arbitrary strings of text or @ref{Text markup}, above or below notes by using a string @code{c^"text"}. By default, these indications do not influence the note spacing, -but by using the command @code{\fatText}, the widths will be taken +but by using the command @code{\textLengthOn}, the widths will be taken into account @lilypond[quote,fragment,ragged-right,verbatim,relative=1] -c4^"longtext" \fatText c4_"longlongtext" c4 +c4^"longtext" \textLengthOn c4_"longlongtext" c4 @end lilypond @noindent -To prevent text from influencing spacing, use @code{\emptyText}. +To prevent text from influencing spacing, use @code{\textLengthOff}. More complex formatting may also be added to a note by using the markup command, @@ -119,10 +119,10 @@ markup}. @refcommands -@funindex \fatText -@code{\fatText}, -@funindex \emptyText -@code{\emptyText}. +@funindex \textLengthOn +@code{\textLengthOn}, +@funindex \textLengthOff +@code{\textLengthOff}. @commonprop @@ -459,7 +459,7 @@ To keep lists of words distinct, please use quotes @code{"} or the @code{\line} command @lilypond[quote,verbatim,fragment,relative=1] -\fatText +\textLengthOn c4^\markup{ \center-align { on three lines } } c4^\markup{ \center-align { "all one line" } } c4^\markup{ \center-align { { on three lines } } } @@ -487,7 +487,7 @@ markup, you need to use the #'padding property or create an #0}). @lilypond[quote,verbatim,fragment,relative=1] -\fatText +\textLengthOn c'4^\markup{ \raise #5 "not raised" } \once \override TextScript #'padding = #3 c'4^\markup{ raised } diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 3e76b025e2..4fc476ae51 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1580,7 +1580,7 @@ The @code{\version} statement records the version of LilyPond that was used to write the file: @example -\version "2.11.23" +\version "2.11.38" @end example @noindent @@ -1602,7 +1602,7 @@ main music expression; the @code{\header} block is usually placed underneath the @ref{Version number}. @example -\version "2.11.23" +\version "2.11.38" \header @{ title = "Symphony" composer = "Me" diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely index 95b865d414..cfbca22610 100644 --- a/Documentation/user/tweaks.itely +++ b/Documentation/user/tweaks.itely @@ -1646,21 +1646,21 @@ Perhaps this is not so good. What we would really like to do is to position all the annotation at the same distance above the staff? To do this, we clearly will need to space the notes out horizontally to make more -room for the text. This is done using the @code{fatText} +room for the text. This is done using the @code{textLengthOn} command. -@subheading \fatText +@subheading \textLengthOn -@funindex \fatText +@funindex \textLengthOn @cindex notes, spreading out with text By default, text produced by markup takes up no horizontal space -as far as laying out the music is concerned. The @code{\fatText} +as far as laying out the music is concerned. The @code{\textLengthOn} command reverses this behaviour, causing the notes to be spaced out as far as is necessary to accommodate the text: @lilypond[quote,fragment,ragged-right,verbatim,relative=2] -\fatText % Cause notes to space out to accommodate text +\textLengthOn % Cause notes to space out to accommodate text c2^"Text1" c^"Text2" c^"Text3" @@ -1668,9 +1668,9 @@ c^"Text4" @end lilypond The command to revert to the default behaviour is -@code{\emptyText}. Remember @code{\once} only works with +@code{\textLengthOff}. Remember @code{\once} only works with @code{\override}, @code{\set}, @code{\revert} or @code{unset}, -so cannot be used with @code{\fatText}. +so cannot be used with @code{\textLengthOn}. Markup text will also avoid notes which project above the staff. If this is not desired, the automatic displacement upwards may @@ -1693,7 +1693,7 @@ c''2 R1 % Turn off collision avoidance \once \override TextScript #'outside-staff-priority = ##f -\fatText % and turn on fatText +\textLengthOn % and turn on textLengthOn c,,2^"Long Text " % Spaces at end are honoured c''2 @end lilypond @@ -1734,7 +1734,7 @@ Should a similar situation arise in @q{real} music, it may be preferable to space out the notes a little further, so the dynamic markings can all fit at the same vertical distance from the staff. We were able to do this -for markup text by using the @code{\fatText} command, but there +for markup text by using the @code{\textLengthOn} command, but there is no equivalent command for dynamic marks. So we shall have to work out how to do this using @code{\override} commands. diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely index 7b1e1cd5b1..94d43b171d 100644 --- a/Documentation/user/working.itely +++ b/Documentation/user/working.itely @@ -536,7 +536,7 @@ file with @code{\include "../global.ly"}, which contains @example %%% global.ly -\version "2.11.23" +\version "2.11.38" #(ly:set-option 'point-and-click #f) \include "../init/init-defs.ly" \include "../init/init-layout.ly" diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly index 627de67da0..729a745b9f 100644 --- a/input/bach-schenker.ly +++ b/input/bach-schenker.ly @@ -14,7 +14,7 @@ I = \once \override NoteColumn #'ignore-collision = ##t -\version "2.11.32" +\version "2.11.38" staffPiano = \new PianoStaff { \set Score.timing = ##f diff --git a/input/cary-layout.ly b/input/cary-layout.ly index 7f49c57688..549bda4fd5 100644 --- a/input/cary-layout.ly +++ b/input/cary-layout.ly @@ -1,5 +1,5 @@ -\version "2.11.11" +\version "2.11.38" \layout { indent = #0 diff --git a/input/cary.ly b/input/cary.ly index 22837f034e..b434aa7467 100644 --- a/input/cary.ly +++ b/input/cary.ly @@ -21,7 +21,7 @@ % Copyright 2006 for the entire score; % All rights reserved by the composer. -\version "2.11.2" +\version "2.11.38" \include "english.ly" \include "cary-layout.ly" @@ -322,11 +322,11 @@ \override Stem #'length = #10 \override Beam #'positions = #'(-13 . -13) \override DynamicLineSpanner #'staff-padding = #18 - \override TextSpanner #'edge-text = #(cons (markup #:italic "covered") "") + \override TextSpanner #'bound-details #'left #'text = #(markup (#:italic "covered")) \override TextSpanner #'dash-period = #1 \override TextSpanner #'dash-fraction = #0.2 - \override TextSpanner #'edge-height = #'(0 . 1.25) - \override TextSpanner #'bound-padding = #0.5 + \override TextSpanner #'bound-details #'left #'padding = #0.5 + \override TextSpanner #'bound-details #'right #'padding = #0.5 \override TextSpanner #'staff-padding = #4 } { diff --git a/input/example-1.ly b/input/example-1.ly index 6f2cf822ea..74ec47ee28 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -18,4 +18,4 @@ also included in the user-manual. %} %% Optional version number -\version "2.10.0" +\version "2.11.38" diff --git a/input/example-2.ly b/input/example-2.ly index 532b461ca5..8693e6e962 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -17,5 +17,5 @@ also included in the user-manual. %} %% Optional version number -\version "2.10.0" +\version "2.11.38" diff --git a/input/example-3.ly b/input/example-3.ly index 85277c45a4..e76f5b4db7 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -33,4 +33,4 @@ also included in the user-manual. %} %% Optional version number -\version "2.10.0" +\version "2.11.38" diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 9f91786efe..89be94295e 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { composer = "ARTHUR GRAY" @@ -219,9 +219,9 @@ middleDynamics = { s32 s s\! s } - \fatText + \textLengthOn s32 s-"rall." s s s8 s4 - \emptyText + \textLengthOff | %5 s2-"a tempo" s8 s \> s s diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly index cbc8ea921d..56ddfc7fa6 100644 --- a/input/manual/chord-names-jazz.ly +++ b/input/manual/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { texidoc = " Chord names are generated from a list pitches. The diff --git a/input/manual/chord-names-languages.ly b/input/manual/chord-names-languages.ly index f1ca5b4a49..1c3324c57d 100644 --- a/input/manual/chord-names-languages.ly +++ b/input/manual/chord-names-languages.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german diff --git a/input/manual/divisiones.ly b/input/manual/divisiones.ly index 5d8d4626ea..9be64b0f0e 100644 --- a/input/manual/divisiones.ly +++ b/input/manual/divisiones.ly @@ -9,7 +9,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior}, " } -\version "2.10.0" +\version "2.11.38" \include "gregorian-init.ly" diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly index 3279c7ee3a..6022cb4725 100644 --- a/input/manual/editorial-headword.ly +++ b/input/manual/editorial-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.7 Editorial annotations diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly index cc65ce18b3..56f873644c 100644 --- a/input/manual/expressive-headword.ly +++ b/input/manual/expressive-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.3 Expressive marks diff --git a/input/manual/font-table.ly b/input/manual/font-table.ly index dae8fd4597..f6f86e6ffe 100644 --- a/input/manual/font-table.ly +++ b/input/manual/font-table.ly @@ -9,7 +9,7 @@ evenFooterMarkup = \markup {} } -\version "2.11.27" +\version "2.11.38" #(define-markup-command (doc-char layout props name) (string?) (interpret-markup layout props diff --git a/input/manual/note-head-style.ly b/input/manual/note-head-style.ly index c561eec4d1..2668343e8f 100644 --- a/input/manual/note-head-style.ly +++ b/input/manual/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header{ texidoc=" Note head shapes may be set from several choices. diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly index 4b4f0b84f1..67e74f8a2b 100644 --- a/input/manual/pitches-headword.ly +++ b/input/manual/pitches-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.1 Pitches diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly index 8169906271..16ce69716c 100644 --- a/input/manual/repeats-headword.ly +++ b/input/manual/repeats-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.7 Repeats diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly index 2d7dbbf92c..ff2a300f35 100644 --- a/input/manual/rhythms-headword.ly +++ b/input/manual/rhythms-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.2 Rhythms diff --git a/input/manual/screech-boink.ly b/input/manual/screech-boink.ly index e13a70e8ee..beada640a5 100644 --- a/input/manual/screech-boink.ly +++ b/input/manual/screech-boink.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { title = "Screech and boink" subtitle = "Random complex notation" diff --git a/input/manual/script-chart.ly b/input/manual/script-chart.ly index 1c86c03eaa..dabd5cf461 100644 --- a/input/manual/script-chart.ly +++ b/input/manual/script-chart.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" % this chart is used in the manual too. diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly index f675e9f0ad..ff363992be 100644 --- a/input/manual/simultaneous-headword.ly +++ b/input/manual/simultaneous-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.5 Simultaneous notes diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly index 3942374a45..d981a20bbe 100644 --- a/input/manual/staff-headword.ly +++ b/input/manual/staff-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.6 Staff notation diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly index c7d8f01e27..c29327137d 100644 --- a/input/manual/text-headword.ly +++ b/input/manual/text-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.34" +\version "2.11.38" \include "english.ly" % NR 1.8 Text diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 08f6657698..34f044362c 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { title = "Title" subtitle = "Subtitle" diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index c29b50f060..310439102b 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -7,7 +7,7 @@ copyright = "Public Domain" } -\version "2.10.0" +\version "2.11.38" global = { \key a \minor diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 176b388c75..31720633f4 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.10.0" +\version "2.11.38" manuscriptBreak = { \break } diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 564d620c2d..b22bbf878c 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -40,7 +40,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "2.10.0" +\version "2.11.38" #(set-global-staff-size 16) diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 4fe111136a..276f102b25 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" forcedLastBreak = { \break } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index ef9f2b053b..63f4f9a048 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.10.0" +\version "2.11.38" %{ Header for Petites Preludes. @@ -126,7 +126,7 @@ four = \relative c{ d4. fis16 g r16 bes8. ~ bes4 | %10 \stemDown - << d,1 { \fatText s4^\markup { \hspace #20 } + << d,1 { \textLengthOn s4^\markup { \hspace #20 } s4^\markup { \hspace #1 } s4 } >> } diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 4d201945e2..0bb7239a35 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -41,7 +41,7 @@ -\version "2.10.0" +\version "2.11.38" diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 0721b1f786..1c0eec1c99 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -4,7 +4,7 @@ #(set-global-staff-size 16) -\version "2.10.0" +\version "2.11.38" \header { title = "Romanzen" diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 1e7960dd22..a63f310d9b 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -41,7 +41,7 @@ virtuoso that taught in Geneva. %} -\version "2.10.0" +\version "2.11.38" \include "mozart-hrn3-defs.ily" \include "mozart-hrn3-allegro.ily" diff --git a/input/proportional.ly b/input/proportional.ly index 0f87feae22..638f3be0bc 100644 --- a/input/proportional.ly +++ b/input/proportional.ly @@ -1,4 +1,4 @@ -\version "2.11.11" +\version "2.11.38" \header { diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index ca15e77116..e32c633a05 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { title = "Puer natus est nobis" subtitle = "Antiphona ad introitum VII" diff --git a/input/regression/allfontstyle.ily b/input/regression/allfontstyle.ily index c6458c46fd..07a42fff7f 100644 --- a/input/regression/allfontstyle.ily +++ b/input/regression/allfontstyle.ily @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header{ texidoc=" @@ -11,7 +11,7 @@ Different text styles are used for various purposes. } \relative c'' \context Staff { - \emptyText + \textLengthOff \repeat volta 2 { \time 4/4 c4^"cuivre"_\fermata } \alternative { { diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly index f709dabb7b..6848b4e876 100644 --- a/input/regression/backend-excercise.ly +++ b/input/regression/backend-excercise.ly @@ -2,7 +2,7 @@ texidoc = "Excercise all output functions" } -\version "2.10.0" +\version "2.11.38" \paper { ragged-right = ##t } @@ -25,7 +25,7 @@ \override Glissando #'style = #'zigzag \slurDashed f2( \glissando f') - \setEasyHeads + \easyHeadsOn f e } >> diff --git a/input/regression/break.ly b/input/regression/break.ly index b3a88c798e..2ba54fdc47 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.11.38" \header{ texidoc=" @@ -13,7 +13,7 @@ Breaks can be encouraged and discouraged using @code{\\break} and } \relative c'' \context Voice { - \emptyText + \textLengthOff c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak c1 \break \mark "break" c1 \break \mark "break" c1 } diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index fe99e4e201..326e45fe84 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header{ @@ -13,7 +13,7 @@ full size." { - \fatText + \textLengthOn \clef "treble" c'1^"treble" \bar "||" \clef "french"c'1^"french" \bar "||" \clef "soprano"c'1^"soprano" \bar "||" diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index 463bd2d5bd..5c75ae804c 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.11.38" \header { texidoc = " Easy-notation (or Ez-notation) prints names in note heads. @@ -11,7 +11,7 @@ You also get ledger lines, of course." } \relative { - \setEasyHeads + \easyHeadsOn f1 e f2 e f4 e diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 242971536d..a43b25b906 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.11.38" \header{ @@ -20,7 +20,7 @@ lyrics ignores any other rhythms in the piece." m = \relative c'' { \autoBeamOff g8( a) r8 \times 2/3 { g'8( f e) } r8 \grace { d16[ c b] } e4 - \emptyText + \textLengthOff d8.^"melisma" \melisma c16 \melismaEnd b diff --git a/input/regression/lyrics-no-notes.ly b/input/regression/lyrics-no-notes.ly index bc870f59b3..c63a805a04 100644 --- a/input/regression/lyrics-no-notes.ly +++ b/input/regression/lyrics-no-notes.ly @@ -8,13 +8,13 @@ the papercolumn is very wide." ragged-right = ##t } -\version "2.10.7" +\version "2.11.38" << \new Staff \relative c' { \key aes \major \context Voice = "1" { f8 f - \emptyText + \textLengthOff f^"xxxxxxxxxxxxxxxxxxxxxxxxxx" f } diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly index e4589d4a9b..00ae9f9095 100644 --- a/input/regression/markup-scheme.ly +++ b/input/regression/markup-scheme.ly @@ -25,10 +25,10 @@ For maintenance reasons, we don't excercise the entire markup command set. -\version "2.11.5" +\version "2.11.38" { - \fatText + \textLengthOn f'1-\markup { foo \raise #0.2 \hbracket \bold bar diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 82256aac18..9627a48ffe 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.11.38" \header{ texidoc=" By default, text is set with empty horizontal dimensions. @@ -11,11 +11,11 @@ to control the horizontal size of text. " } } \relative c''{ - %% \emptyText + %% \textLengthOff %% short for \override TextScript #'no-spacing-rods = ##t c2_"very wide and long text" c | \break %% short for \override TextScript #'no-spacing-rods = ##f - \fatText + \textLengthOn c_"very wide and long text" c } |