From: Han-Wen Nienhuys Date: Sun, 28 Dec 2008 17:26:23 +0000 (-0200) Subject: Merge branch 'stable' X-Git-Tag: release/2.12.1-1~16^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d664f5a7153ec2b1a1c4c9fba2d2174bf3140695;hp=38c30df0ef4153793a253adcd8e9eb93926da82d;p=lilypond.git Merge branch 'stable' Conflicts: VERSION --- diff --git a/Documentation/TRANSLATION b/Documentation/TRANSLATION index 31afbd1edd..a5119569ae 100644 --- a/Documentation/TRANSLATION +++ b/Documentation/TRANSLATION @@ -120,9 +120,9 @@ Word counts (excluding lilypond snippets) are given for each file. 23 user/dedication.itely 423 user/macros.itexi 171 index.html.in -6339 po/lilypond-doc.pot (translate to po/.po) +6346 po/lilypond-doc.pot (translate to po/.po) --- ../lilypond-texi2html.init (section TRANSLATIONS) -13750 total +13757 total -2- Introduction and beginning of Application Usage 411 user/preface.itely @@ -153,13 +153,13 @@ Word counts (excluding lilypond snippets) are given for each file. 2286 user/text.itely 76 user/specialist.itely -- Specialist notation 2670 user/vocal.itely -1398 user/chords.itely +1464 user/chords.itely 702 user/piano.itely 810 user/percussion.itely 826 user/guitar.itely 66 user/strings.itely 242 user/bagpipes.itely -4486 user/ancient.itely +4487 user/ancient.itely 5805 user/input.itely -- Input syntax 2164 user/non-music.itely -- Non-musical notation 8451 user/spacing.itely -- Spacing issues @@ -167,7 +167,7 @@ Word counts (excluding lilypond snippets) are given for each file. 5202 user/programming-interface.itely -- Interfaces for programmers 1190 user/notation-appendices.itely -- Notation manual tables 250 user/cheatsheet.itely -- Cheat sheet -62623 total +62690 total -5- Application usage 3248 user/lilypond-book.itely -- LilyPond-book diff --git a/Documentation/de/translations.html.in b/Documentation/de/translations.html.in index 85cb413edc..b5abe693f8 100644 --- a/Documentation/de/translations.html.in +++ b/Documentation/de/translations.html.in @@ -1,4 +1,4 @@ -·

Zuletzt aktualisiert am·Sun Dec 21 09:36:02 UTC 2008 +·

Zuletzt aktualisiert am·Sun Dec 28 01:18:10 UTC 2008

Till Rettig ja - teilweise + ja vor-GDP @@ -317,7 +317,7 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 2.4 Saiteninstrumente mit Bünden
(1830) + 2.4 Saiteninstrumente mit Bünden
(1850) Till Rettig ja @@ -329,7 +329,7 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - teilweise + ja vor-GDP @@ -341,7 +341,7 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 2.7 Notation von Akkorden
(1398) + 2.7 Notation von Akkorden
(1464) Till Rettig ja @@ -349,7 +349,7 @@ translations.template.html.in; DO NOT EDIT !--> vor-GDP - 2.8 Notation von alter Musik
(4486) + 2.8 Notation von alter Musik
(4487) Till Rettig teilweise (79 %) @@ -368,7 +368,7 @@ translations.template.html.in; DO NOT EDIT !--> 3 Allgemeine Eingabe und Ausgabe
(5805) Till Rettig - teilweise (5 %) + ja ja vor-GDP @@ -409,7 +409,7 @@ translations.template.html.in; DO NOT EDIT !--> Till Rettig ja - teilweise + ja vor-GDP diff --git a/Documentation/de/user/changing-defaults.itely b/Documentation/de/user/changing-defaults.itely index 1d4fd732d5..49a1315f70 100644 --- a/Documentation/de/user/changing-defaults.itely +++ b/Documentation/de/user/changing-defaults.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: b4a63b6e388283e2f2ac73c3c99da205d209e28a + Translation of GIT committish: 8405b88e6c1aac6c44e6064dd7b8b1674d6e7abd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/chords.itely b/Documentation/de/user/chords.itely index ae67e160aa..dfde97e477 100644 --- a/Documentation/de/user/chords.itely +++ b/Documentation/de/user/chords.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -149,7 +149,10 @@ Septakkorde können erstellt werden: @funindex m Diese Tabelle zeigt die Funktion der Modifikatoren von Dreiklängen -und Septakkorden. Eine vollständigere Tabelle findet sich in +und Septakkorden. Die siebte Stufe wird standardmäßig als kleine +Septime realisiert, sodass der Dominantseptakkord die Grundform +des Septakkordes darstellt. Alle Alterationen sind relativ zur +Dominantsept. Eine vollständigere Tabelle findet sich in @ref{Common chord modifiers}. @c @table @code @@ -177,8 +180,7 @@ Standard: erzeugt einen Durdreiklang. @item m, m7 @tab -Mollakkord: Dieser Modifikator erniedrigt die dritte und (wenn -vorhanden) die siebte Stufe. +Mollakkord: Dieser Modifikator erniedrigt die dritte Stufe. @tab @lilypond[line-width=4\cm, noragged-right] \chordmode { @@ -231,11 +233,22 @@ benutzen, um einen Durdreiklang zu notieren. @seealso Notationsreferenz: -@ref{Common chord modifiers}. +@ref{Common chord modifiers}, +@ref{Extended and altered chords}. Schnipsel: @rlsr{Chords}. +@knownissues + +Nur ein Qualitätsmodifikator sollte pro Akkord benutzt werden, meistens +für die höchste Stufe des Akkordes. Akkorde mit weiteren Qualitätsmodifikatoren +werden ohne Warnung oder Fehlermeldung gelesen, aber das Ergebnis ist +nicht vorhersagbar. Akkorde, die nicht mit einem einzigen +Qualitätsmodifikator erreicht werden können, sollten mit einzelnen +Tonhöhen alteriert werden, wie beschrieben in +@ref{Extended and altered chords}. + @node Extended and altered chords @unnumberedsubsubsec Extended and altered chords @@ -251,7 +264,9 @@ Umgkehrungen zu erzeugen. Die erste Zahl, die auf den Doppelpunkt folgt, wird als @qq{Bereich} des Akkordes interpretiert: Terzen werden auf dem Grundton -gestapelt, bis die angegebene Zahl (=Tonstufe) erreicht ist. Wenn +gestapelt, bis die angegebene Zahl (=Tonstufe) erreicht ist. +Die siebte Stufe, die zu einem Akkord hinzugefügt wird, ist die +kleine Septime, nicht die große. Wenn der Bereich keine Terz ist (also etwa 6), dann werden Terzen bis zur höchst möglichen Terz unter dem Bereich gestapelt, und der Endton des Bereichs wird hinzugefügt. Der größtmögliche Wert ist @@ -288,7 +303,9 @@ entfernt (es sei denn sie wird explizit verlangt). Kompliziertere Akkorde können auch konstruiert werden, indem einzelne Intervalle zu dem Grundton addiert werden. Diese Additionen werden nach dem Bereich notiert und mit -Punkten voneinander getrennt. +Punkten voneinander getrennt. Die normale Septime, die zu +einem Akkord hinzugefügt wird, ist die kleine Septime, nicht +die große. @lilypond[quote,verbatim,fragment,relative=1] \chordmode { diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely index e4963548a2..31ea0c46ae 100644 --- a/Documentation/de/user/fretted-strings.itely +++ b/Documentation/de/user/fretted-strings.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -928,7 +928,9 @@ Liste an Akkordformen. Die Akkordformen sind Bunddiagramme, die am Hals entlang verschoben werden können und dabei unterschiedliche Akkorde ergeben. Akkordformen können zu der internen Liste hinzugefügt werden und dann benutzt werden, um vordefinierte -Bunddiagramme zu definieren. Wie Bunddiagramme können auch +Bunddiagramme zu definieren. Weil sie auf verschiedenen Positionen +auf dem Steg gelegt werden können, beinhalten vordefinierte +Akkord üblicherweise keine leeren Saiten. Wie Bunddiagramme können auch Akkordformen entweder als @code{fret-diagram-terse}-Definition oder als @code{fret-diagram-verbose}-Liste erstellt werden. diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/user/fundamental.itely index beee827c97..8de21cf455 100644 --- a/Documentation/de/user/fundamental.itely +++ b/Documentation/de/user/fundamental.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/input.itely b/Documentation/de/user/input.itely index 05f76061cf..12e9edfea6 100644 --- a/Documentation/de/user/input.itely +++ b/Documentation/de/user/input.itely @@ -1,263 +1,2017 @@ -@c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- +@c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.61" +@c \version "2.11.65" @node General input and output @chapter General input and output -@untranslated - +Dieses Kapitel erklärt allgemeine Fragen zur Eingabe und Ausgabe von +Notation mit LilyPond und weniger direkte Fragen der Notation. @menu -* Input structure:: -* Titles and headers:: -* Working with input files:: -* Controlling output:: -* MIDI output:: +* Input structure:: +* Titles and headers:: +* Working with input files:: +* Controlling output:: +* MIDI output:: @end menu + @node Input structure @section Input structure -@untranslated - +Das hauptsächliche Eingabeformat von LilyPond sind Textdateien. +Üblicherweise werden diese Dateien mit der Endung @code{.ly} +versehen. @menu -* Structure of a score:: -* Multiple scores in a book:: -* File structure:: +* Structure of a score:: +* Multiple scores in a book:: +* File structure:: @end menu + @node Structure of a score @subsection Structure of a score -@untranslated +@funindex \score + +Eine @code{\score}-Umgebung muss einen einzelnen musikalischen +Ausdruck beinhalten, der durch geschweifte Klammern begrenzt wird: + +@example +\score @{ +... +@} +@end example + +@warning{Es darf @strong{nur ein} äußerer musikalischer Ausdruck +in der @code{\score}-Umgebung geschrieben werden, und er @strong{muss} +von geschweiften Klammern umgeben sein.} + +Dieser einzelne musikalische Ausdruck kann beliebige Größe annehmen und +andere musikalische Ausdrücke von beliebiger Komplexität beinhalten. +Alle diese Beispielse sind musikalische Ausdrücke: + +@example +@{ c'4 c' c' c' @} +@end example + +@lilypond[verbatim,quote] +{ + { c'4 c' c' c'} + { d'4 d' d' d'} +} +@end lilypond + +@lilypond[verbatim,quote] +<< + \new Staff { c'4 c' c' c' } + \new Staff { d'4 d' d' d' } +>> +@end lilypond + +@example +@{ + \new GrandStaff << + \new StaffGroup << + \new Staff @{ \Flöte @} + \new Staff @{ \Oboe @} + >> + \new StaffGroup << + \new Staff @{ \GeigeI @} + \new Staff @{ \GeigeII @} + >> + >> +@} +@end example + +Kommentare bilden eine Ausnahme dieser Regel. (Andere Ausnahmen +siehe @ref{File structure}.) Sowohl einzeilige als auch +Blockkommentare (eingegrenzt durch @code{%@{ .. %@}}) können +an beliebiger Stelle einer Eingabedatei geschrieben werden. Sie +können innerhalb oder außerhalb der @code{\score}-Umgebung vorkommen, +und innerhalb oder außerhalb des einzelnen musikalischen Ausdrucks +innerhalb der @code{\score}-Umgebung. + + +@seealso +Handbuch zum Lernen: +@rlearning{Working on input files}, +@rlearning{Music expressions explained}, +@rlearning{Score is a (single) compound musical expression}. @node Multiple scores in a book @subsection Multiple scores in a book -@untranslated +@funindex \book +@cindex Sätze, mehrere + +Eine Partitur kann mehrere musikalische Stücke und verschiedene +Texte beinhalten. Beispiele hierzu sind etwa eine Etüdensammlung +oder ein Orchesterstück mit mehreren Sätzen. Jeder Satz wird +in einer eigenen @code{\score}-Umgebung notiert: + +@example +\score @{ + @var{..Noten..} +@} +@end example + +@noindent +und Texte werden mit einer @code{\markup}-Umgebung geschrieben: + +@example +\markup @{ + @var{..Text..} +@} +@end example + +@funindex \book + +Alle Sätze und Texte, die in derselben @code{.ly}-Datei vorkommen, +werden normalerweise in eine einzige Ausgabedatei gesetzt. + +@example +\score @{ + @var{..} +@} +\markup @{ + @var{..} +@} +\score @{ + @var{..} +@} +@end example + +Wenn Sie aber mehrere Ausgabedateien aus einer einzigen @code{.ly}-Datei +erstellen wollen, können Sie mehrere @code{\book}-Umgebungen notieren. +Wenn Sie keine @code{\book}-Umgebung in Ihrer Datei angeben, interpretiert +LilyPond die gesamte Datei als eine große @code{\book}-Umgebung (siehe +auch @ref{File structure}. Eine wichtige Ausnahme stellen Dokumente dar, +die mit lilypond-book erstellt werden, für die Sie explizit +@code{\book}-Umgebungen notieren müssen, weil sonst nur die erste +@code{\score}- bzw. @code{\markup}-Umgebung angezeigt wird. + +Der Kopfbereich für jedes Musikstück kann innerhalb der @code{\score}-Umgebung +definiert werden. Die @code{piece}-(Stück)-Bezeichnung aus dieser +@code{\header}-Umgebung wird vor jedem Satz ausgegeben. Die Überschrift für +ein ganzes Buch kann innerhalb von @code{\book} notiert werden, aber wenn +diese Umgebung fehlt, wird die @code{\header}-Umgebung genommen, die auf +erster Ebene der Datei notiert ist. + +@example +\header @{ + title = "Acht Miniaturen" + composer = "Igor Stravinsky" +@} +\score @{ + @dots{} + \header @{ piece = "Romanze" @} +@} +\markup @{ + ..Text der zweiten Strophe.. +@} +\markup @{ + ..Text der dritten Strophe.. +@} +\score @{ + @dots{} + \header @{ piece = "Menuetto" @} +@} +@end example + +@funindex \bookpart + +Stücke können innerhalb eines Buches mit @code{\bookpart} gruppiert +werden. Derartige Buchabschnitte werden durch einen Seitenumbruch +voneinander getrennt und können wie auch das ganze Buch selber mit +einem Titel innerhalb einer @code{\header}-Umgebung beginnen. +@example +\bookpart @{ + \header @{ + title = "Buchtitel" + subtitle = "Erster Teil" + @} + \score @{ @dots{} @} + @dots{} +@} +\bookpart @{ + \header @{ + subtitle = "Zweiter Teil" + @} + \score @{ @dots{} @} + @dots{} +@} +@end example @node File structure @subsection File structure -@untranslated +@funindex \paper +@funindex \midi +@funindex \layout +@funindex \header +@funindex \score +@funindex \book +@funindex \bookpart + +@cindex Dateistruktur +@cindex Struktur, Datei +@cindex Eingabedatei, Struktur +@cindex Quelldatei, Struktur + +Eine @code{.ly}-Datei kann eine belibige Anzahl an Ausdrücken +auf der obersten Ebene beinhalten, wobei ein Ausdrück der obersten +Ebene einer der folgenden sein kann: + +@itemize @bullet +@item +Eine Ausgabedefinition, wie @code{\paper}, @code{\midi} und +@code{\layout}. Derartige Definitionen auf oberster Ebene verändern +die globalen Einstellungen für das ganze @qq{Buch}. Wenn mehr +als eine derarte Definition desselben Typs angegeben wird, hat +die spätere Vorrang. + +@item +Ein direkter Scheme-Ausdruck, wie etwa +@code{#(set-default-paper-size "a7" 'landscape)} oder +@code{#(ly:set-option 'point-and-click #f)}. + +@item +Eine @code{\header}-Umgebung. Damit wird die globale Titelei +eingestellt. Das ist die Umgebung, in der sich Definition für +das ganze Buch befinden, wie Komponist, Titel usw. + +@item +Eine @code{\score}-Umgebung. Die in ihr enthaltene Partitur wird +zusammen mit anderen vorkommenden @code{\score}-Umgebungen gesammelt +und in ein @code{\book} zusammengefasst. Dieses Verhalten kann +verändert werden, indem die Variable @code{toplevel-score-handler} +auf höchster Ebene gesetzt wird. Die Definition des Standards findet sich +in der Datei @file{../scm/@/lily@/.scm}. + +@item +Eine @code{\book}-Umgebung fasst mehrere Sätze (d. h. mehrere +@code{\score}-Umgebungen) logisch in ein Dokument zusammen. +Wenn mehrere @code{\score}-Partituren vorkommen, wird für jede +@code{\book}-Umgebung eine eigene Ausgabedatei erstellt, in der +alle in der Umgebung enthaltenen Partituren zusammengefasst sind. +Der einzige Grund, explizit eine @code{\book}-Umgebung zu setzen, +ist, wenn mehrere Ausgabedateien aus einer einzigen Quelldatei +erstellt werden sollen. Eine Ausnahme sind lilypond-book-Dokumente, +in denen eine @code{\book}-Umgebung explizit hinzugefügt werden +muss, wenn mehr als eine @code{\score}- oder @code{\markup}-Umgebung +im gleichen Beispiel angezeigt werden soll. Dieses Verhalten +kann verändert werden, indem die Variable @code{toplevel-book-handler} +auf höchster Ebene gesetzt wird. Die Definition des Standards +findet sich in der Datei @file{../scm/@/lily@/.scm}. + +@item +Eine @code{\bookpart}-Umgebung. Ein Buch (@code{\book}) kann in +mehrere Teile untergliedert sein, indem @code{\bookpart}-Umgebungen +eingesetzt werden. Jeder Buchabschnitt beginnt auf einer neuen +Seite und kann eigene Papierdefinitionen in einer @code{\paper}-Umgebung +haben. + +@item +Ein zusammengesetzter musikalischer Ausdruck wie etwa +@example +@{ c'4 d' e'2 @} +@end example + +Dieses Beispiel wird von LilyPond automatisch in einer +@code{\score}-Umgebung in einem Buch interpretiert und +mit anderen @code{\score}-Umgebungen und musikalischen +Ausdrücken auf der höchsten Ebene zusammen ausgegeben. +Anders gesagt: eine Datei, die nur das obige Beispiel +beinhaltet, wird übersetzt zu + +@example +\book @{ + \score @{ + \new Staff @{ + \new Voice @{ + @{ c'4 d' e'2 @} + @} + @} + @} + \layout @{ @} + \header @{ @} +@} +@end example + +Dieses Verhalten kann verändert werden, indem die Variable +@code{toplevel-music-handler} auf der oberseten Ebene gesetzt +wird. Die Definition des Standards findet sich in der Datei +@file{../scm/@/lily@/.scm}. + +@item +Eine Textbeschriftung, eine Strophe etwa: +@example +\markup @{ + 2. Die erste Zeile der zweiten Strophe. +@} +@end example + +Textbeschriftungen werden über, zwischen oder unter musikalischen +Ausdrücken gesetzt, so wie sie notiert werde. + +@cindex Variablen + +@item +Eine Variable, wie +@example +foo = @{ c4 d e d @} +@end example + +Sie kann dann später in der Datei eingesetzt werden, indem @code{\foo} +geschrieben wird. Die Beizeichnung der Variable darf nur aus +alphabetischen Zeichen bestehen, keine Zahlen, Unter- oder Bindestriche. + +@end itemize + +Das folgende Beispiel zeigt drei Dinge, die auf der obersten Ebene +notiert werden können: + +@example +\layout @{ + % Zeilen rechtsbündig setzen + ragged-right = ##t +@} + +\header @{ + title = "Do-re-mi" +@} + +@{ c'4 d' e2 @} +@end example + +An einer beliebigen Stelle der Datei kann jede der folgenden lexikalen +Anweisungen notiert werden: + +@itemize +@item @code{\version} +@item @code{\include} +@item @code{\sourcefilename} +@item @code{\sourcefileline} +@item +Ein einzeiliger Kommentar, beginnend mit @code{%}. + +@item +Ein mehrzeiliger Kommentar, umgeben von @code{%@{ .. %@}}. + +@end itemize + +@seealso +Hanbuch zum Lernen: +@rlearning{How LilyPond input files work}. @node Titles and headers @section Titles and headers -@untranslated - +Fast alle gedruckten Noten beinhalten einen Titel und den Namen +des Komponisten, teilweise wird auch noch sehr viel mehr Information +zur Verfügung gestellt. @menu -* Creating titles:: -* Custom titles:: -* Reference to page numbers:: -* Table of contents:: +* Creating titles:: +* Custom titles:: +* Reference to page numbers:: +* Table of contents:: @end menu + @node Creating titles @subsection Creating titles -@untranslated +Überschriften können für jede @code{\score}-Umgebung erstellt werden, sowohl +für die gesamte Datei (oder eine @code{\book}-Umgebung) als auch für +einzelne Buchabschnitte (innerhalb einer @code{\bookpart}-Umgebung). + +Der Inhalt der Titelei wird aus der @code{\header}-Umgebung übernommen. Die +@code{\header}-Umgebung eines Buches unterstützt folgende Felder: + +@table @code +@funindex dedication +@item dedication +Die Widmung der Noten, wird auf oben auf der ersten Seite gesetzt. + +@funindex title +@item title +Die Überschrift der Noten, wird unter der Widmung zentriert gesetzt. + +@funindex subtitle +@item subtitle +Untertitel, zentriert unter der Überschrift. + +@funindex subsubtitle +@item subsubtitle +Unteruntertitel, zentriert unter dem Untertitel. + +@funindex poet +@item poet +Name des Dichters, linksbündig unter dem Unteruntertitel. + +@funindex instrument +@item instrument +Bezeichnung des Instruments, zentriert unter dem Unteruntertitel. +Auch oben auf der Seite zentriert (andere als erste Seite). + +@funindex composer +@item composer +Name des Komponisten, rechtsbüngig unter dem Unteruntertitel. + +@funindex meter +@item meter +Metrum, linksbündig unter dem Dichter. + +@funindex arranger +@item arranger +Name des Bearbeiters/Arrangeurs, rechtsbündig unter dem Komponisten. + +@funindex piece +@item piece +Bezeichnung des Stückes, linksbündig unter dem Metrum. + +@funindex opus +@item opus +Bezeichnung des Opus, rechtsbündig unter dem Bearbeiter. + +@cindex Seitenumbruch, erzwingen +@funindex breakbefore + +@item breakbefore +Hiermit beginnt der Titel auf einer neuen Steite. (Kann die Werte +##t (wahr) oder ##f (falsch) haben.) + +@funindex copyright +@item copyright +Anzeige eines Copyright, zentriert unten auf der ersten Seite. Um das +Copyright-Symbol zu notieren, siehe @ref{Text encoding}. + +@funindex tagline +@item tagline +Zentriert unten auf der letzten Seite. Enthält standardmäßig: @qq{Music +engraving by LilyPond (@var{version})---www.lilypond.org} + +@end table + +Hier eine Demonstration der möglichen Felder. Beliebige +Formatierungsbefehle für Textbeschriftung können in der Titelei +eingesetzt werden. Siehe hierzu auch @ref{Formatting text}. + +@c KEEP LY +@lilypond[quote,verbatim,line-width=11.0\cm] +\paper { + line-width = 9.0\cm + paper-height = 10.0\cm +} + +\book { + \header { + dedication = "mir gewidmet" + title = \markup \center-column { "Titel erste Zeile" "Titel zweite Zeile, länger" } + subtitle = "Untertitel" + subsubtitle = #(string-append "Unteruntertitel LilyPond-Version " +(lilypond-version)) + poet = "Dichter" + composer = \markup \center-column { "Komponist" \small "(1847-1973)" } + texttranslator = "Übersetzer" + meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "r" \huge +"um" } + arranger = \markup { \fontsize #8.5 "Be" \fontsize #2.5 "ar" \fontsize +#-2.5 "be" \fontsize #-5.3 "i" \fontsize #7.5 "ter" } + instrument = \markup \bold \italic "Instrument" + piece = "Stück" + } + + \score { + { c'1 } + \header { + piece = "Stück zwei" + opus = "Opus1" + } + } + \markup { + und jetzt... + } + \score { + { c'1 } + \header { + piece = "Stück2" + opus = "Opus2" + } + } +} +@end lilypond + +Wie schon oben gezeigt, können mehrfache @code{\header}-Umgebungen +eingesetzt werden. Wenn das gleiche Feld in mehreren +Umgebungen, wird die letzte vorkommende +Version benutzt. Hier ein kurzes Beispiel: + +@example +\header @{ + composer = "Komponist" +@} +\header @{ + piece = "Stück" +@} +\score @{ + \new Staff @{ c'4 @} + \header @{ + piece = "Neues Stück" % überschreibt die die vorige Definition + @} +@} +@end example + +Wenn @code{\header} innerhalb der @code{\score}-Umgebung definiert wird, +wird normalerweise nur die Information von @code{piece} und @code{opus} +ausgegeben. Musikalische Ausdrücke innerhalb von @code{\score} müssen +vor @code{\header} gesetzt werden. + +@lilypond[quote,verbatim,line-width=11.0\cm] +\score { + { c'4 } + \header { + title = "title" % not printed + piece = "piece" + opus = "opus" + } +} +@end lilypond + +@funindex print-all-headers + +@noindent +Dieses Verhalten kann verändert werden (sodass alle Angaben aus der +überschrift gesetzt werden, wenn sich @code{\header} innerhalb von +@code{\score} befindet), indem man schreibt: + +@example +\paper@{ + print-all-headers = ##t +@} +@end example + +@cindex Copyright +@cindex Tagline + +Die Standardfußzeile ist leer mit Ausnahme der ersten Seite, auf der +das @code{copyright}-Feld aus der @code{\header}-Umgebung eingefügt wird, +und die letzte Seite, auf der das @code{tagline}-Feld eingefügt wird. +Der Standardinhalt von @code{tagline} ist @qq{Music engraving by +LilyPond (@var{version})---www.lilypond.org}. Gut gesetzte Noten werben sehr effektiv +für LilyPond, darum bitten wir darum, diese Zeile stehen zu lassen, +wenn es möglich ist. + +Ein Titelfeld kann vollständig entfernt werden, indem es auf +falsch gesetzt wird: + +@example +\header @{ + tagline = ##f + composer = ##f +@} +@end example @node Custom titles @subsection Custom titles -@untranslated +Kompliziertere Anpassungen können vorgenommen werden, indem die +folgenden Variablen innerhalb der @code{\paper}-Umgebung geändert +werden. Die Init-Datei @file{../ly/titling-init.ly} enthält das +Standardverhalten. + +@table @code + +@funindex bookTitleMarkup + +@item bookTitleMarkup +Das ist die Überschrift, die für das gesamte Dokument gilt. Üblicherweise +wird hier der Komponist und die Überschrift des Werkes genannt. + +@funindex scoreTitleMarkup + +@item scoreTitleMarkup +Das ist die Überschrift, die vor jede @code{\score}-Umgebung gesetzt wird. +Überlicherweise wird hier etwa die Bezeichnung eines Satzes notiert +(im @code{piece}-Feld). + +@funindex oddHeaderMarkup + +@item oddHeaderMarkup +Das ist der Seitenkopf für ungerade Seiten. + +@funindex evenHeaderMarkup + +@item evenHeaderMarkup +Das ist der Seitenkopf für gerade Seiten. Wenn undefiniert, wird der +ungerade Seitenkopf eingesetzt. + +Standardmäßig werden die Kopfzeilen so definiert, dass die Seitennummer +sich außen befindet und das Instrument zentriert gesetzt wird. + +@funindex oddFooterMarkup + +@item oddFooterMarkup +Das ist die Fußzeile für ungerade Seiten. + +@funindex evenFooterMarkup + +@item evenFooterMarkup +Das ist die Fußzeile für gerade Seiten. Wenn undefiniert, wird die +ungerade Fußzeile eingesetzt. + +Standardmäßig wird in der Fußzeile auf der ersten Seite das Copyright +und auf der letzten Seite die Tag-Zeile gesetzt. + +@end table + + +@funindex \paper +@cindex Kopfzeile +@cindex Fußzeile +@cindex Seitenlayout +@cindex Layout der Seite +@cindex Titel +@cindex Überschriften + +Die folgende Definition setzt die Überschrift linksbündig und +den Komponisten rechtsbündig auf einer einzelnen Zeile: + +@verbatim +\paper { + bookTitleMarkup = \markup { + \fill-line { + \fromproperty #'header:title + \fromproperty #'header:composer + } + } +} +@end verbatim @node Reference to page numbers @subsection Reference to page numbers -@untranslated +Eine bestimmte Stelle der Partitur kann mit einem @code{\label}-Befehl +markiert werden, sowohl auf oberster Ebene als auch innerhalb eines +musikalischen Ausdrucks. Auf diese Marke kann dann verwiesen werden, +um die Seitenzahl zu erhalten, auf der die Marke vorkommt. Der +Verweis wird mit dem Befehl @code{\page-ref} gefordert (innerhalb +von @code{\markup}). + +@c KEEP LY +@lilypond[verbatim,line-width=11.0\cm] +\header { tagline = ##f } +\book { + \label #'ErstePartitur + \score { + { + c'1 + \pageBreak \mark A \label #'ZeichenA + c' + } + } + + \markup { Die erste Partitur fäng auf Seite \page-ref #'ErstePartitur "0" "?" an.} + \markup { Zeichen A befindet sich auf Seite \page-ref #'ZeichenA "0" "?". } +} +@end lilypond + +Der @code{\page-ref}-Textbeschriftungsbefehl braucht drei Argumente: + +@enumerate + +@item die Marke, ein Scheme-Symbol, etwa @code{#'ErstePartitur}, +@item eine Beschriftung, die als Platzhalter benutzt wird, um die Breite des Verweisen zu schätzen, +@item eine Beschriftung, die anstelle der Seitenzahl gesetzt wird, wenn die Marke unbekann ist. +@end enumerate + +Der Grund, warum ein Platzhalter benötigt wird, ist dass zu dem Zeitpunkt, +an dem die Textbeschriftungen ausgewertet werden, noch keine Seitenumbrüche +vorgenommen wurden und die Seitenzahlen deshalb noch nicht bekannt sind. +Um hier ein Problem zu vermeiden, wird die eigentliche Auswertung der +Textbeschriftung erst später ausgeführt, die Größe des Textes muss aber +schon vorher bekannt sein. Die Größe wird mithilfe des Platzhalters +bestimmt. Wenn eine Partitur zwischen 10 und 99 Seiten hat, kann man +"00" schreiben, also eine zweistellige Zahl. + +@code{\label} +@code{\page-ref} + +@predefined +@funindex \label, +@funindex \page-ref. +@endpredefined @node Table of contents @subsection Table of contents -@untranslated +Ein Inhaltsverzeichnis kann eingefügt werden mit dem Befehl +@code{\markuplines \table-of-contents}. Die Elemente, die im +Inhaltsverzeichnis aufgelistet werden sollen, werden mit dem +@code{\tocItem}-Befehl markiert, welches sowohl auf höchster +Ebene als auch in einem musikalischen Ausdruck verwendet werden +kann. + +@verbatim +\markuplines \table-of-contents +\pageBreak + +\tocItem \markup "Erste Partitur" +\score { + { + c' % ... + \tocItem \markup "Ein bestimmter Punkt innerhalb der ersten Partitur" + d' % ... + } +} +\tocItem \markup "zweite Partitur" +\score { + { + e' % ... + } +} +@end verbatim + +Die Beschriftungen, die benutzt werden um das Inhaltsverzeichnis +zu formatieren, sind in der @code{\paper}-Umgebung definiert. +Die Standardformatierungselemente sind @code{tocTitleMarkup} +um die Überschrift zu formatieren und @code{tocItemMarkup} um +die einzelnen Inhaltselemente zu formatieren, bestehend aus +dem Titelelement und einer Seitenzahl. Die Variablen können +durch den Benutzer geändert werden: + +@verbatim +\paper { + %% Übersetzung der Inhaltsverzeichnisüberschrift nach französisch: + tocTitleMarkup = \markup \huge \column { + \fill-line { \null "Table des matières" \null } + \hspace #1 + } + %% hier größere Schriftarten + tocItemMarkup = \markup \large \fill-line { + \fromproperty #'toc:text \fromproperty #'toc:page + } +} +@end verbatim -@node Working with input files -@section Working with input files +Die Inhaltsverzeichniselemente Text und Seitenzahl werden +in der Definition von @code{tocItemMarkup} aufgerufen mit +@code{#'toc:text} und @code{#'toc:page}. + +Neue Befehle und Beschriftungen können auch definiert werden, +um eigene Inhaltsverzeichnisse zu gestalten: + +@itemize + +@item zuerst muss eine neue Beschriftungsvariable in der +@code{\paper}-Umgebung definiert werden + +@item dann muss die musikalische Funktion definiert werden, die +ein Element zum Inhaltsverzeichnis hinzufügt, indem die neue +Variable benutzt wird. + +@end itemize + +Das folgende Beispiel definiert einen neuen Stil um Akt-Bezeichnungen +einer Oper in das Inhaltsverzeichnis aufzunehmen: + +@verbatim +\paper { + tocActMarkup = \markup \large \column { + \hspace #1 + \fill-line { \null \italic \fromproperty #'toc:text \null } + \hspace #1 + } +} + +tocAct = +#(define-music-function (parser location text) (markup?) + (add-toc-item! 'tocActMarkup text)) +@end verbatim + +@lilypond[line-width=11.0\cm] +\header { tagline = ##f } +\paper { + tocActMarkup = \markup \large \column { + \hspace #1 + \fill-line { \null \italic \fromproperty #'toc:text \null } + \hspace #1 + } +} + +tocAct = +#(define-music-function (parser location text) (markup?) + (add-toc-item! 'tocActMarkup text)) + +\book { + \markuplines \table-of-contents + \tocAct \markup { Atto Primo } + \tocItem \markup { Coro. Viva il nostro Alcide } + \tocItem \markup { Cesare. Presti omai l'Egizzia terra } + \tocAct \markup { Atto Secondo } + \tocItem \markup { Sinfonia } + \tocItem \markup { Cleopatra. V'adoro, pupille, saette d'Amore } + \markup \null +} +@end lilypond + + +@seealso +Installierte Dateien: @file{../ly/@/toc@/-init@/.ly}. -@untranslated +@funindex \table-of-contents +@funindex \tocItem +@predefined +@code{\table-of-contents}, +@code{\tocItem}. +@endpredefined + + +@node Working with input files +@section Working with input files @menu -* Including LilyPond files:: -* Different editions from one source:: -* Text encoding:: -* Displaying LilyPond notation:: +* Including LilyPond files:: +* Different editions from one source:: +* Text encoding:: +* Displaying LilyPond notation:: @end menu + @node Including LilyPond files @subsection Including LilyPond files -@untranslated +@funindex \include +@cindex einfügen von Dateien +@cindex Dateien einfügen + +Ein größeres Projekt kann in einzelne Dateien aufteteilt werden. +Um eine andere Datei einzubinden, kann der Befehl + +@example +\include "andereDatei.ly" +@end example + +@noindent +benutzt werden. + +Die Zeile @code{\include "andereDatei.ly"} benimmt sich genauso, +also ob der Inhalt der Datei @code{andereDatei.ly} komplett in die +Hauptdatei eingefügt werden würde. So kann man für ein größeres +Projekt die einzelnen Stimmen der Instrumente getrennt notieren +und sie dann in einer Partitur-Datei benutzen. Meistens werden +in den eingefügten Dateien einige Variablen definiert, die dann +auch in der Hauptdatei eingesetzt werden können. Mit Marken (Tags) +gekennzeichnete Abschnitte können eingesetzt werden, um die +entsprechenden Noten etc. an verschiedenen Stellen in der Datei +zur Verfügung zu stellen. Siehe auch @ref{Different editions from +one source}. + +Auf Dateien im aktuellen Verzeichnis kann einfach mit dem Dateinamen +nach dem @code{\include}-Befehl verwiesen werden. Dateien an anderen +Stellen können eingebunden werden, indem entweder ein vollständiger +Pfad oder ein relativer Pfad zu der Datei angegeben wird. Hierbei +sollten die für UNIX typischen Schrägstriche (/) und nicht die +rückwärtsgeneigten von Windows (\) verwendet werden, um die Verzeichnisse +zu trennen. Wenn etwa die Datei @file{kram.ly} ein Verzeichnis +höher liegt als das aktuelle Verzeichnis, sollte der Befehl so +aussehen: + +@example +\include "../kram.ly" +@end example + +@noindent +Wenn die Orchesterstimmen andererseits in einem Unterordner mit +der Bezeichnung @code{stimmen} liegen, sieht er folgendermaßen +aus: + +@example +\include "stimmen/VI.ly" +\include "stimmen/VII.ly" +... etc +@end example + +Dateien, die eingebunden werden sollen, können selber auch wiederum +ein @code{\include} enthalten. Diese Einbindung zweiter Ebene +werden erst interpretiert, wenn sie sich in der Hauptdatei befinden, +sodass die Pfadangaben hier nicht relativ zur eingebundenen Datei, +sondern relativ zur Hauptdatei gesetzt werden müssen. + +Dateien können auch aus einem Verzeichnis eingebunden werden, +dass im Suchpfad von LilyPond liegt. Hierzu muss auf der +Kommandozeile das entsprechende Verzeichnis angegeben werden +und die Dateien, die eingebunden werden, müssen nur mit ihrem Namen +notiert sein. Wenn etwa die Datei @file{Haupt.ly} kompiliert +werden soll, die Dateien aus dem Unterverzeichnis @file{stimmen} +einbindet, müssen sie sich im Verzeichnis von @file{Haupt.ly} +befinden und dann LilyPond folgendermaßen aufrufen: + +@example +lilypond --include=stimmen Haupt.ly +@end example + +@noindent +In @file{Haupt.ly} steht: + +@example +\include "VI.ly" +\include "VII.ly" +... usw. +@end example + +Dateien, die in vielen Partituren verwendet werden sollen, können +im LilyPond-Verzeichnis @file{../ly} gespeichert werden. (Die +Stelle, an der dieses Verzeichnis sich befindet, hängt vom Betriebssystem +ab, siehe hierzu @rlearning{Other sources of information}). Dateien +in diesem Verzeichnis können einfach mit ihrem Namen eingefügt werden. +So werden auch die Sprachdateien wie etwa @file{deutsch.ly} eingefügt. + +LilyPond lädt eine Anzahl an Dateien, wenn das Programm aufgerufen wird. +Diese Dateien sind für den Benutzer nicht ersichtlich, aber die Dateien +können identifiziert werden, indem LilyPond auf der Komandozeile mit +Option aufgerufen wird: @code{lilypond --verbose}. Hiermit wird +neben anderer Information auch eine Liste and Pfaden und Dateien +aufgeführt, die LilyPond benutzt. Die wichtigeren Dateien werden +im Abschnitt @rlearning{Other sources of information} besprochen. +Diese Dateien können verändert werden, aber Änderungen gehen verloren, +wenn eine neue LilyPond-Version installiert wird. + +Eine einfache Beispiele, die die Benutzung von @code{\include} demonstrieren, +sind dargestellt in +@rlearning{Scores and parts}. + +@seealso +Handbuch zum Lernen: +@rlearning{Other sources of information}, +@rlearning{Scores and parts}. + +@knownissues + +Wenn eine Datei eingebunden wird, deren Name einer Datei aus +dem Installationsverzeichnis von LilyPond entspricht, wird die +installierte Datei anstelle der eigenen verwendet. @node Different editions from one source @subsection Different editions from one source -@untranslated - +Es gibt verschiedene Funktionen, die es möglich machen, unterschiedliche +Versionen einer Partitur aus der gleichen Quelldatei zu produzieren. +Variablen werden am besten eingesetzt, wenn es darum geht, längere +Notenpassagen und/oder Anmerkungen/Textmarken miteinander auf +verschiedene Weise zu kombinieren. Tag-Marken dagegen werden am +besten eingesetzt, wenn eine von mehreren kurzen alternativen +Notenabschnitten ausgewählt werden soll. Egal welche Methode am +Ende eingesetzt wird: Es erleichtert die Arbeit in jedem Fall, wenn +die eigentlichen Noten und die Struktur der Paritur voneinander +getrennt notiert werden -- so kann die Struktur geändert werden, +ohne dass man Änderungen an den Noten vornehmen muss. @menu -* Using variables:: -* Using tags:: +* Using variables:: +* Using tags:: @end menu @node Using variables @unnumberedsubsubsec Using variables -@untranslated +@cindex Variablen, Benutzung + +Wenn Notenabschnitt in Variablen definiert werden, können sie +an unterschiedlichen Stellen in der Partitur eingesetzt werden, +siehe auch @rlearning{Organizing pieces with variables}. Zum +Beispiel enthält eine Vokalpartitur für ein @notation{a cappella} +Stück oft einen Klavierauszug, der das Einüben einfacher macht. +Der Klavierauszug enthält die gleichen Noten, sodass man sie nur +einmal notieren muss. Noten aus zwei Variablen können auf einem +System kombiniert werden, siehe @ref{Automatic part combining}. +Hier ein Beispiel: + +@lilypond[verbatim,quote] +sopranoMusic = \relative c'' { a4 b c b8( a)} +altoMusic = \relative g' { e4 e e f } +tenorMusic = \relative c' { c4 b e d8( c) } +bassMusic = \relative c' { a4 gis a d, } +allLyrics = \lyricmode {King of glo -- ry } +<< + \new Staff = "Soprano" \sopranoMusic + \new Lyrics \allLyrics + \new Staff = "Alto" \altoMusic + \new Lyrics \allLyrics + \new Staff = "Tenor" { + \clef "treble_8" + \tenorMusic + } + \new Lyrics \allLyrics + \new Staff = "Bass" { + \clef "bass" + \bassMusic + } + \new Lyrics \allLyrics + \new PianoStaff << + \new Staff = "RH" { + \set Staff.printPartCombineTexts = ##f + \partcombine + \sopranoMusic + \altoMusic + } + \new Staff = "LH" { + \set Staff.printPartCombineTexts = ##f + \clef "bass" + \partcombine + \tenorMusic + \bassMusic + } + >> +>> +@end lilypond + +Unterschiedliche Partituren, die entweder nur den Chor oder das +Klavier zeigen, können produziert werden, indem die Struktur +verändert wird; die Noten müssen dazu nicht verändert werden. + +Für längere Partituren können Variablen in eigene Dateien notiert +werden, die dann eingebunden werden, siehe @ref{Including +LilyPond files}. @node Using tags @unnumberedsubsubsec Using tags -@cindex Erweiterung von Wiederholungen -@funindex \unfoldRepeats - -Mit ein bisschen Anpassung können alle Wiederholungstypen -auch in der MIDI-Datei wiedergegeben werden. Das wird erreicht -durch die @code{\unfoldRepeats}-Funktion. Hiermit werden alle -Wiederholungen, welcher Art auch immer, in notengetreue Wiederholungen -umgewandelt, die Noten werden also wiederholt ausgegeben. +@cindex Tag +@cindex Marke +@cindex markierte Noten entfernen +@cindex markierte Noten behalten + +@funindex \tag +@funindex \keepWithTag +@funindex \removeWithTag +@funindex tag +@funindex keepWithTag +@funindex removeWithTag + +Der @code{\tag #'@var{TeilA}}-Befehl markiert einen musikalischen +Ausdruck mit der Bezeichnung @var{TeilA}. Ausdrücke, die auf diese +Weise markiert werden, können mit ihrer Bezeichnung später ausgewählt +bzw. ausgefiltert werden. Das geschieht mit den Befehlen +@code{\keepWithTag #'@var{Bezeichnung}} bzw. @code{\removeWithTag #'@var{Bezeichnung}}. +Die Wirkung dieser Filter auf die markierten Notenabschnitte ist +wie folgt: + +@multitable @columnfractions .5 .5 + +@headitem Filter + @tab Resultat + +@item +Markierte Noten mit vorgesetztem @code{\keepWithTag #'@var{Bezeichnung}} + @tab Unmarkierte Noten und Noten mit der Marke @var{Bezeichnung} werden + gesetzt, Noten mit einer anderen Marke werden nicht angezeigt. + +@item +Markierte Noten mit vorgesetztem @code{\removeWithTag #'@var{Bezeichnung}} + @tab Unmarkierte Noten und Noten mit einer anderen Marke als + @var{Bezeichnung} wird angezeigt, Noten markiert mit @var{Bezeichnung} + werden nicht angezeigt. + +@item +Markierte Noten, weder mit vorgesetztem @code{\keepWithTag} noch +@code{\removeWithTag} + @tab Alle markierten und unmarkierten Noten werden angezeigt. + +@end multitable + +Die Argumente der Befehle @code{\tag}, @code{\keepWithTag} und +@code{\removeWithTag} sollten ein Symbol sein (wie etwa +@code{#'score} oder @code{#'part}), gefolgt von einem musikalischen +Ausdruck. + +Im folgenden Beispiel erscheinen zwei Versionen der Noten, eine +zeigt Triller in normaler Notation, die andere zeigt sie ausgeschrieben: + +@lilypond[verbatim,quote] +music = \relative g' { + g8. c32 d + \tag #'trills {d8.\trill } + \tag #'expand {\repeat unfold 3 {e32 d} } + c32 d + } + +\score { + \keepWithTag #'trills \music +} +\score { + \keepWithTag #'expand \music +} +@end lilypond -@lilypond[quote,verbatim,fragment,line-width=8.0\cm] -\unfoldRepeats { - \repeat tremolo 8 {c'32 e' } - \repeat percent 2 { c''8 d'' } - \repeat volta 2 {c'4 d' e' f'} - \alternative { - { g' a' a' g' } - {f' e' d' c' } - } +@noindent +Entsprechend können auch Abschnitte ausgeschlossen werden; das +erfordert manchmal weniger Schreibarbeit: + +@lilypond[verbatim,quote] +music = \relative g' { + g8. c32 d + \tag #'trills {d8.\trill } + \tag #'expand {\repeat unfold 3 {e32 d} } + c32 d + } + +\score { + \removeWithTag #'expand + \music +} +\score { + \removeWithTag #'trills + \music } -\bar "|." @end lilypond -Wenn man eine Partitur schreibt, die diesen @code{\unfoldRepeats}-Befehl -für die MIDI-Ausgabe benutzt, muss man zwei @code{\score}-Umgebungen -schreiben: eine für die MIDI-Ausgabe, wo die Wiederholungen ausgeschrieben -werden, und eine für die gedruckte Notation, in der Klammern, Tremolo und -Prozent-Wiederholungen benutzt werden. Zum Beispiel: +Marken können auch auf Artikulationen, Text usw angewendet werden, +indem man ihnen @example -\score @{ - @var{..music..} - \layout @{ .. @} -@} -\score @{ - \unfoldRepeats @var{..music..} - \midi @{ .. @} -@} +-\tag #'@var{your-tag} @end example +@noindent +voranstellt (jedoch nach der Note, an die sie gebunden sind). Mit +diesem Code etwa könnte man entweder Fingersatz oder aber einen +Text ausgeben: + +@example +c1-\tag #'finger ^4 +c1-\tag #'warn ^"Achtung!" +@end example + +Mehrfache Marken können mithilfe von mehreren @code{\tag}-Befehlen +notiert werden: + +@lilypond[quote,verbatim] +music = \relative c'' { + \tag #'a \tag #'both { a a a a } + \tag #'b \tag #'both { b b b b } +} +<< +\keepWithTag #'a \music +\keepWithTag #'b \music +\keepWithTag #'both \music +>> +@end lilypond + +Mehrfache @code{\removeWithTag}-Filter können auf einen +musikalischen Ausdruck angewendet werden, um mehrere unterschiedliche +markierte Abschnitte aus dem Druckbild zu entfernen. + +@lilypond[verbatim,quote] +music = \relative c'' { +\tag #'A { a a a a } +\tag #'B { b b b b } +\tag #'C { c c c c } +\tag #'D { d d d d } +} +{ +\removeWithTag #'B +\removeWithTag #'C +\music +} +@end lilypond + +Zwei oder mehr @code{\keepWithTag}-Filter in einem musikalischen +Ausdruck bewirken, dass @emph{alle} markierten Abschnitte entfernt +werden, weil der erste Befehl alle markierten Abschnitt außer dem +im Befehl genannten wegfiltert und der zweite Befehl dann auch diesen +eben genannten zusätzlich entfernt. + + +@seealso +Handbuch zum Lernen: +@rlearning{Organizing pieces with variables}. + +Notationsreferenz: +@ref{Automatic part combining}, +@ref{Including LilyPond files}. + + +@ignore +@c This warning is more general than this placement implies. +@c Rests are not merged whether or not they come from tagged sections. +@c Should be deleted? -td + +@knownissues + +Multiple rests are not merged if you create a score with more +than one tagged section at the same place. + +@end ignore + @node Text encoding @subsection Text encoding -@untranslated +LilyPond benutzt alle Zeichen, die durch das Unicode-Konsortium +und ISO/IEC 10646 definiert sind. Hiermit wird den Zeichen +fast aller Schriftsysteme der Welt ein eindeutiger Name und ein +Code-Punkt zugewiesen, mit dem sie identifizierbar sind. Unicode +kann mit mehreren Zeichenkodierungen verwirklicht werden. LilyPond +benutzt die UTF-8-Kodierung (UTF = Unicode Transformation Format), +in der die normalen Zeichen des lateinischen Alphabets mit einem +Byte dargestellt werden, während alle anderen Zeichen zwischen +zwei und vier Byte Länge haben. + +Das Aussehen des Zeichens wird bestimmt durch die gerade benutzte +Schriftart (engl. font). In einer Schriftartdatei werden die +Nummern der Unicode-Zeichen einem bestimmten Glyphen zugeordnet. +LilyPond verwendet die Pango-Bibliothek um mehrsprachige Texte +und komplexe Skripte korrekt zu setzen. + +LilyPond verändert die Kodierung der Eingabedatei nicht. Das heißt, +dass jeder Text -- Überschriften, Gesangstext, Spielanweisungen etc. -- +der nicht nur aus ASCII-Zeichen besteht, in UTF-8 kodiert sein +musst. Am einfachsten geht das, indem man einen Texteditor +einsetzt, der mit Unicode-Zeichen umgehen kann. Die meisten +modernen weit verbreiteten Editoren besitzen heute UTF-8-Unterstützung, +wie etwa vim, Emacs, jEdit oder GEdit. Alle MS Windows-Systeme +nach NT benutzen Unicode intern, sodass sogar Notepad Dateien +in UTF-8 lesen und speichern kann. Ein Editor mit mehr +Funktionen unter Windows ist BabelPad oder Notepad++. + +Wenn eine LilyPond-Eingabedatei nicht-ASCII-Zeichen enthält +und nicht in UTF-8 gespeichert ist, gibt es folgende Fehlermeldung: + +@example +FT_Get_Glyph_Name () error: invalid argument +@end example + +Heir ein Beispiel mit Kyrilliza, hebräischem und portugiesischem Text: + +@lilypond[quote] +%c No verbatim here as the code does not display correctly in PDF +% Cyrillic +bulgarian = \lyricmode { + Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон. +} + +% Hebrew +hebrew = \lyricmode { + זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן. +} + +% Portuguese +portuguese = \lyricmode { + à vo -- cê uma can -- ção legal +} + +\relative { + c2 d e f g f e +} +\addlyrics { \bulgarian } +\addlyrics { \hebrew } +\addlyrics { \portuguese } +@end lilypond + +Um einen einzelnen Buchstaben zu notieren, für den die Unicode-Buchstabenfolge +bekannt ist, der aber nicht auf der Tastatur zu finden ist, kann +der Befehl @code{\char ##xhhhh} innerhalb einer @code{\markup}-Umgebung +benutzt werden. Hierbei bedeutet @code{hhhh} die hexadezimale Zahl +für das erforderliche Zeichen. Mit @code{\char ##x03BE} wird +beispielsweise das Unicode-Zeichen U+03BE notiert, welches die +Unicode-Bezeichnung @qq{Greek Small Letter Xi} hat. Alle existierenden +Unicode-Zeichen können auf diese Weise notiert werden, und wenn für alle +Zeichen dieses Format angewandt wird, muss die Datei nicht im utf-8-Format +gespeichert werden. Es muss natürlich auch noch eine Schriftart auf +dem System installiert sein, die die notierten Zeichen darstellen kann. + +Das nächste Beispiel zeigt Unicode-Zeichen an vier Stellen mit dem +Zahlencode notiert: in einem Übungszeichen, als Artikulationszeichen, +im Gesangstext und als normaler Text außerhalb der Partitur. + +@lilypond[quote,verbatim] +\score { + \relative c'' { + c1 \mark \markup { \char ##x03EE } + c1_\markup { \tiny { \char ##x03B1 " to " \char ##x03C9 } } + } + \addlyrics { O \markup { \concat{ Ph \char ##x0153 be! } } } +} +\markup { "Copyright 2008" \char ##x00A9 } +@end lilypond + +Um das Copyright-Zeichen zu notieren, kann folgender Code eingesetzt werden: + +@example +\header @{ + copyright = \markup @{ \char ##x00A9 "2008" @} +@} +@end example @node Displaying LilyPond notation @subsection Displaying LilyPond notation -@untranslated +@funindex \displayLilyMusic +Ein musikalischer Ausdruck in LilyPond-Notation kann mit der Funktion +@code{\displayMusic} angezeigt werden. Der Code -@node Controlling output -@section Controlling output +@example +@{ + \displayLilyMusic \transpose c a, @{ c e g a bes @} +@} +@end example -@untranslated +@noindent +etwa wird ausgeben: + +@example +@{ a, cis e fis g @} +@end example +Normalerweise werden diese Zeilen zusammen mit allen anderen +Nachrichten auf der Kommandozeile ausgegeben. Um sie separat zu +speichern und das Ergebnis von @code{\displayMusic} weiterzubenutzen, +kann die Ausgabe mit folgendem Befehl in eine Datei umgeleitet werden: + +@c TODO What happens under Windows? + +@example +lilypond file.ly >display.txt +@end example + + + +@node Controlling output +@section Controlling output @menu -* Extracting fragments of music:: -* Skipping corrected music:: +* Extracting fragments of music:: +* Skipping corrected music:: @end menu + @node Extracting fragments of music @subsection Extracting fragments of music -@untranslated +Es ist möglich, kleine Abschnitte einer großen Partitur direkt aus der +Quelldatei zu erzeugen. Das kann damit verglichen werden, dass man +mit der Schere bestimmte Regionen ausschneidet. + +Es wird erreicht, indem man die Takte, die ausgeschnitten werden sollen +(engl. to clip = ausschneiden), extra definiert. Mit folgender +Defintion beispielsweise + +@verbatim +\layout { + clip-regions + = #(list + (cons + (make-rhythmic-location 5 1 2) + (make-rhythmic-location 7 3 4))) +} +@end verbatim + +@noindent +wird ein Fragment ausgeschnitten, dass auf der Mitte des fünften Taktes +beginnt und im siebten Takt endet. Die Bedeutung von @code{5 1 2} ist: +nach einer Halben in Takt fünf, @code{7 3 4} heißt: nach drei Vierteln +in Takt 7. + +Weitere Bereiche, die ausgeschnitten werden sollen, können definiert +werden, indem mehrere derartige Paare definiert werden. + +Um diese Funktion auch nutzen zu können, muss LilyPond mit dem +Parameter @code{-dclip-systems} aufgerufen werden. Die Schnipsel +werden als EPS ausgegeben und dann zu PDF und PNG konvertiert, wenn +diese Formate auch als Parameter angegeben werden. + +Zu mehr Information über Ausgabeformate siehe @rprogram{Invoking lilypond}. @node Skipping corrected music @subsection Skipping corrected music -@untranslated + +@funindex skipTypesetting +@funindex showFirstLength +@funindex showLastLength + +Wenn man Noten eingibt oder kopiert, sind meistens nur die Noten nahe dem +Ende (wo gerade neue Noten notiert wurden) wichtig für Kontrolle und +Korrektur. Um die Korrektur zu beschleunigen, kann eingestellt werden, +dass nur die letzten paar Takte angezeigt werden. Das erreicht man +mit dem Befehl + +@verbatim +showLastLength = R1*5 +\score { ... } +@end verbatim + +@noindent +in der Quelldatei. Damit werden nur die letzten fünf Takte (in einem +4/4-Takt) eines jeden @code{\score}-Abschnitts übersetzt. Besonders +bei längeren Stücken ist es meistens sehr viel schneller, nur einen +kleinen Teil des Stückes zu setzen als die gesamte Länge. Wenn man +am Anfang eines Stückes arbeitet (weil etwa ein neuer Teil hinzugefügt +werden soll), kann auch die @code{showFirstLength}-Eigenschaft +nützlich sein. + +Nur bestimmte Teile einer Partitur zu überspringen, kann mit der +Eigenschaft @code{Score.skipTypesetting} sehr genau kontrolliert +werden. Für den Bereich, für den sie auf @qq{wahr} gesetzt wird, +wird kein Notensatz ausgegeben. + +Diese Eigenschaft kann auch benutzt werden, um die MIDI-Ausgabe zu +kontrollieren. Hiermit werden alle Ereignisse, auch Tempo- und +Instrumentenwechsel ausgelassen. Man muss also sehr genau darauf +achten, dass nichts unerwartetes geschieht. + +@lilypond[quote,fragment,ragged-right,verbatim] +\relative c'' { + c8 d + \set Score.skipTypesetting = ##t + e e e e e e e e + \set Score.skipTypesetting = ##f + c d b bes a g c2 } +@end lilypond + +In polyphoner Notation wirkt sich @code{Score.skipTypesetting} auf +alle Stimmen und Systeme aus, sodass noch mehr Zeit bei der +Übersetzung der Datei gespart wird. @node MIDI output @section MIDI output -@untranslated +@cindex Klang +@cindex MIDI + +MIDI (Musical Instrument Digital Interface) ist ein Standard zur +Kontrolle und Interaktion mit digitalen Instrumenten. Eine +MIDI-Datei ist eine Anzahl von Noten auf einer Anzahl von +Bändern/Stimmen. Es ist keine eigentliche Klangdatei, denn man +benötigt spezielle Programme die die Notenereignisse in Klang +umwandeln können. + +Der Notensatz von LilyPond kann in MIDI umgewandelt werden, so dass +man sich anhören kann, was man notiert hat. Das hilft oft sehr gut +bei der Überprüfung: falsche Oktaven oder falsche Versetzungszeichen +lassen sich meist sehr gut hören. + +Die MIDI-Ausgabe benötigt einen Kanal für jedes System und einen für +globale Einstellungen. Darum sollte die Quelldatei für eine MIDI-Datei +nicht mehr als 15 Systeme (oder 14 wenn kein Schlagzeug benützt wird) +besitzen. Jedes weitere System bleibt stumm. @menu -* Creating MIDI files:: -* MIDI block:: -* What goes into the MIDI output?:: -* Repeats in MIDI:: -* Controlling MIDI dynamics:: -* Percussion in MIDI:: +* Creating MIDI files:: +* MIDI block:: +* What goes into the MIDI output?:: +* Repeats in MIDI:: +* Controlling MIDI dynamics:: +* Percussion in MIDI:: @end menu + @node Creating MIDI files @subsection Creating MIDI files -@untranslated +Um eine MIDI-Datei aus einer LilyPond-Quelldatei zu erstellen, muss +eine @code{\midi}-Umgebung zu der @code{\score}-Umgebung hinzugefügt +werden, etwa so: + +@example +\score @{ + @var{...Noten...} + \midi @{ @} +@} +@end example + +Wenn in einer @code{\score}-Umgebung nur eine @code{\midi}-Umgebung, +aber keine @code{\layout}-Umgebung vorkommt, wird nur MIDI produziert. +Wenn auch die Notation gewünscht ist, muss zusätzlich die +@code{\layout}-Umgebung vorhanden sein: + +@example +\score @{ + @var{...music...} + \midi @{ @} + \layout @{ @} +@} +@end example + +Tonhöhen, Rhythmen, Überbindungen, Dynamik und Tempoänderungen werden +korrekt in das MIDI-Format übersetzt. Dynamikzeichen, Crescendo und +Decrescendo werden in den MIDI-Lautstärkekanal übertragen. Dynamikzeichen +werden in einen bestimmten Lautstärkenwert übersetzt, Crescendo und +Decrescendo erreichen einen Übergang zwischen Lautstärkewerten. +Die Wirkung von Dynamikzeichen kann auch aus der MIDI-Datei entfernt +werden. Siehe hierzu @ref{MIDI block}. + +Das Anfangstempo und spätere Tempoänderungen können mit dem +@code{\tempo}-Befehl innerhalb der Notation notiert werden. Er +bewirkt Tempoänderungen auch in der MIDI-Datei. Der Befehl setzt +gleichzeitig auch eine Tempobezeichnung in die Noten, welches aber +auch unterdrückt werden kann, siehe @ref{Metronome marks}. Eine +andere möglichkeit, ein eigenes MIDI-Tempo anzugeben, wird weiter +unten gezeigt, siehe @ref{MIDI block}. @unnumberedsubsubsec Instrument names + +@cindex Instrumentbezeichnungen + +@funindex Staff.midiInstrument + +Das MIDI-Instrument, mit dem ein bestimmtes System wiedergegeben +werden soll, wird durch die @code{Staff.midiInstrument}-Eigenschaft +bestimmt, die auf eine Instrumentenbezeichnung gesetzt werden muss. +Die Bezeichnungen sind aufgelistet in @ref{MIDI instruments} und müssen +in der dort definierten Schreibweise notiert werden. + +@example +\new Staff @{ + \set Staff.midiInstrument = #"glockenspiel" + @var{...Noten...} +@} +@end example + +@example +\new Staff \with @{midiInstrument = #"cello"@} @{ + @var{...Noten...} +@} +@end example + +Wenn die Schreibweise nicht genau einem definierten Instrument aus +der Liste entpsricht, wird ein Piano-Klang benutzt (@code{"acoustic grand"}). + +@snippets + +@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +{changing-midi-output-to-one-channel-per-voice.ly} + +@knownissues + +Veränderungen der MIDI-Lautstärke sind nur effektiv, wenn sie zu Beginn +einer Note angefordert werden, sodass die Lautstärke während einer Notendauer +nicht geändert werden kann. + +Nicht alle MIDI-Spieler können Tempoänderungen richtig wiedergeben. +Spieler, die hierzu in der Lage sind, sind unter Anderen MS Windows Media +Player und @uref{http://@/timidity@/.sourceforge@/.net/,timidity}. + + @node MIDI block @subsection MIDI block -@untranslated +@cindex MIDI-Umgebung + +Eine @code{\midi}-Umgebung muss innerhalb von einer @code{\score}-Umgebung +vorkommen, wenn MIDI-Ausgabe gewünscht ist. Sie entspricht der +@code{\layout}-Umgebung, aber ist etwas einfacher aufgebaut. Oft wird +die MIDI-Umgebung einfach leer gelassen, aber hier können auch +Kontexte umgeändert werden, neue Kontexte definiert werden oder +neue Werte definiert werden. Das folgende Beispiel etwa definiert +das MIDI-Tempo, ohne dass in der Partitur eine Metronombezeichnung +gesetzt wird: + +@example +\score @{ + @var{...Noten...} + \midi @{ + \context @{ + \Score + tempoWholesPerMinute = #(ly:make-moment 72 4) + @} + @} +@} +@end example + +Hier wird das Tempo auf 72 Viertelnoten pro Minute definiert. Wenn +das Tempo auf diese Weise definiert wird, kann keine punktierte +Note als Einheit angegeben werden. Wenn sie benötigt wird, muss +man sie in kleinere Einheiten auflösen. Ein Tempo von 90 punktierten +Viertelnoten pro Minute kann beispielsweise dargestellt werden +als 270 Achtelnoten pro Minute: + +@example +tempoWholesPerMinute = #(ly:make-moment 270 8) +@end example + +@cindex MIDI-Kontextdefinitionen + +Kontextdefinitionen des @code{\midi}-Kontextes entsprechen +der Syntax, wie sie in der @code{\layout}-Umgebung benutzt +wird. Klangübersetzungsmodule werden @code{performer} +genannt. Die Kontexte für die MIDI-Ausgabe sind in der +Datei @file{../ly/@/performer@/-init@/.ly} definiert, siehe +@rlearning{Other sources of information}. Um beispielsweise +die Auswirkung von Dynamikzeichen aus der MIDI-Ausgabe zu +entfernen, müssen folgende Zeilen eingefügt werden: + +@example +\midi @{ + ... + \context @{ + \Voice + \remove "Dynamic_performer" + @} +@} +@end example + +Eine MIDI-Ausgabe wird nur erstellt, wenn die @code{\midi}-Umgebung +in eine Partiturumgebung eingefügt wird, die mit dem Befehl +@code{\score} beginnt. Wenn eine Partitur explizit etwa mit +@code{\new Score} begonnen wird, und sich die MIDI-Umgebung hierin +befindet, wird keine Ausgabe produziert. Eine Lösung ist es, sowohl +die @code{\new Score}- als auch die @code{\midi}-Umgebungen in eine +@code{\score}-Umgebung einzuschließen. + +@example +\score @{ + \new Score @{ @dots{}Noten@dots{} @} + \midi @{ @} +@} +@end example @node What goes into the MIDI output? @subsection What goes into the MIDI output? -@untranslated - @unnumberedsubsubsec Supported in MIDI + +@cindex Tonhöhen in MIDI +@cindex MIDI, Tonhöhen +@cindex Vierteltöne in MIDI +@cindex MIDI, Vierteltöne +@cindex Mikrotöne in MIDI +@cindex MIDI, Mikrotöne +@cindex Akkordsymbole in MIDI +@cindex MIDI, Akkordsymbole +@cindex Rhythmen in MIDI +@cindex MIDI, Rhythmen + +Die folgenden Notationselemente werden in die MIDI-Ausgabe aufgenommen: + +@itemize +@item Tonhöhen +@item Vierteltöne (siehe @ref{Accidentals}. Für die Ausgabe wird ein +Spieler benötigt, der Tonhöhen verändern kann.) +@item Akkorde, die als Symbole notiert werden +@item Rhythmen, die als Dauern notiert sind, inklusive N-tolen +@item Tremolo, das ohne @q{@code{:}[@var{Zahl}]} notiert ist +@item Überbindungen +@item Dynamikzeichen +@item Crescendi, decrescendi zu mehreren Noten +@item Tempoänderungen, die mit einer Tempo-Bezeichnung eingegeben werden +@item Gesangstext +@end itemize + + @unnumberedsubsubsec Unsupported in MIDI + +Folgende Notationselemente werden nicht in die MIDI-Ausgabe einbeozogen: + +@itemize +@item Rhythmus, der als Anmerkung notiert wird, bspw. Swing +@item Tempoveränderungen, die als Anmerkung ohne Tempobezeichnung notiert werden +@item Staccato und andere Artikultationen und Ornamente +@item Legato- und Phrasierungsbögen +@item Crescendi, decrescendi zu einer einzelnen Note +@item Tremolo, notiert mit @q{@code{:}[@var{number}]} +@item Bezifferter Bass +@end itemize + + @node Repeats in MIDI @subsection Repeats in MIDI -@untranslated +@cindex Wiederholungen in MIDI +@cindex MIDI und Wiederholungen + +@funindex \unfoldRepeats + +Mit einigen Veränderungungen im Notentext können alle Wiederholungstypen +auch in der MIDI-Ausgabe wiedergegeben werden. Das wird erreicht, indem +die @code{\unfoldRepeats}-Funktion eingesetzt wird. Diese Funktion +verändert alle Wiederholungen in ausgeschriebene Noten. + +@lilypond[quote,verbatim] +\unfoldRepeats { + \repeat tremolo 8 {c'32 e' } + \repeat percent 2 { c''8 d'' } + \repeat volta 2 {c'4 d' e' f'} + \alternative { + { g' a' a' g' } + {f' e' d' c' } + } +} +\bar "|." +@end lilypond + +Wenn eine Partitur mit diesem Befehl erstellt wird, ist er notwendig, +zwei @code{\score}-Umgebungen einzurichten: in der einen werden die +Wiederholungen ausgeschrieben und nur eine MIDI-Ausgabe produziert, +in der anderen werden die Wiederholungen notiert und als Partitur +gesetzt. Das Beispiel gibt einen Hinweis, wie eine derartige Datei +aussehen kann: + +@example +\score @{ + @var{..music..} + \layout @{ .. @} +@} +\score @{ + \unfoldRepeats @var{..music..} + \midi @{ .. @} +@} +@end example @node Controlling MIDI dynamics @subsection Controlling MIDI dynamics -@untranslated +Dynamik in der MIDI-Ausgabe wird durch den Dynamic_performer +erstellt, welcher sich in einem @code{Voice}-Kontext befindet. +Es ist möglich, sowohl die generelle Lautstärke einer MIDI-Datei +als auch relative Lautstärken von Dynamikanweisungen und auch +relative Lautstärke von einzelnen Instrumenten einzustellen. @unnumberedsubsubsec Dynamic marks + + +Dynamikanweisungen werden als ein bestimmter Bruch der insgesamt +zur Verfügung stehenden MIDI-Lautstärke notiert. Die Standardbrüche +reichen von 0,25 für @notation{ppppp} bis hin zu 0,95 für +@notation{fffff}. Diese Anweisung befinden sich in der Datei +@file{../scm/midi.scm}, siehe auch @rlearning{Other sources of information}. +Diese Brüche können nach Belieben geändert oder erweitert werden, indem +eine Funktion erstellt wird, die ein Dynamikzeichen als Argument +nimmt und den erforderlichen Bruch ausgibt; schließlich muss noch +@code{Score.dynamicAbsoluteVolumeFunction} auf diese Funktion +gesetzt werden. + +Beispielhaft soll gezeigt werden, wie man eine @notation{Rinforzando}-Dynamik, +@code{\rfz}, auch in die MIDI-Ausgabe übernehmen kann. Gleiches gilt +für neue, selbstdefinierte Dynamikzeichen, die in den Standarddefinitionen +nicht enthalten sind. Die Scheme-Funktion, die hier definiert wird, +setzt den Bruch von 0,9 für eine rfz-Anweisung und ruft andernfalls die +Standardanweisungen auf: + +@lilypond[verbatim,quote] +#(define (myDynamics dynamic) + (if (equal? dynamic "rfz") + 0.9 + (default-dynamic-absolute-volume dynamic))) + +\score { + \new Staff { + \set Staff.midiInstrument = #"cello" + \set Score.dynamicAbsoluteVolumeFunction = #myDynamics + \new Voice { + \relative c'' { + a\pp b c-\rfz + } + } + } + \layout {} + \midi {} +} +@end lilypond + +Alternativ, insbesondere wenn die gesamte Tabelle der MIDI-Lautstärken +umdefiniert werden soll, ist es besser, die +@notation{default-dynamic-absolute-volume}-Prozedur in der Datei +@file{../scm/midi.scm} und die hiermit verknüpfte Tabelle als Modell +zu benutzen. Das letzte Beispiel dieses Abschnittes zeigt, wie das +gemacht werden kann. + + @unnumberedsubsubsec Overall MIDI volume + +Die generellen Mindest- und Höchstwerte für die Lautstärke der MIDI-Datei +wird kontrolliert, indem die Eigenschaften @code{midiMinimumVolume} +unde @code{midiMaximumVolume} auf der @code{Score}-Ebene gesetzt +werden. Diese Eigenschaften haben nur Einfluss auf Dynamikzeichen, sodass +ein Dynamikzeichen direkt an den Anfang der Partitur gestellt werden muss, +wenn diese Einstellung von Anfang an Wirkung zeigen soll. Der Bruch, +der dann den einzelnen Dynamikzeichen entspricht, wird mit der +Formel + +@example +midiMinimumVolume + (midiMaximumVolume - midiMinimumVolume) * Bruch +@end example + +@noindent +errechnet. Im folgenden Beispiel wird die generelle MIDI-Lautstärke +auf den Bereich zwischen 0.2 und 0.5 eingeschränkt. + +@lilypond[verbatim,quote] +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Staff.midiInstrument = #"flute" + \new Voice \relative c''' { + r2 g\mp g fis ~ + fis4 g8 fis e2 ~ + e4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 2) + midiMinimumVolume = #0.2 + midiMaximumVolume = #0.5 + } + } +} +@end lilypond + + @unnumberedsubsubsec Equalizing different instruments (i) + +Wenn die Mindest- und Höchstwerte für die MIDI-Lautstärke +innerhalb eines @code{Staff}-Kontextes gesetzt werden, +kann damit die relative Lautstärke einzelner Instrumente kontrolliert +werden. Damit kann man die Qualität der MIDI-Datei +merklich verbessern. + +In diesem Beispiel wird die Lautstärke der Klarinette relativ +zur Lautstärke der Flöte verringert. In jeder Stimme muss +eine Dynamikanweisung für die erste Note gesetzt werden, damit +diese Einstellung korrekt funktioniert. + +@lilypond[verbatim,quote] +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Staff.midiInstrument = #"flute" + \set Staff.midiMinimumVolume = #0.7 + \set Staff.midiMaximumVolume = #0.9 + \new Voice \relative c''' { + r2 g\mp g fis ~ + fis4 g8 fis e2 ~ + e4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \set Staff.midiMinimumVolume = #0.3 + \set Staff.midiMaximumVolume = #0.6 + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 2) + } + } +} +@end lilypond + + @unnumberedsubsubsec Equalizing different instruments (ii) +Wenn Mindest- und Höchstwerte für die Lautstärke der MIDI-Datei +nicht vorgegeben werden, nimmt LilyPond standardmäßig einige +Anpassungen für die Lautstärken bestimmter Instrumente vor. +Diese Instrumente und ihre entsprechende Veränderung lassen +sich aus der Tabelle @notation{instrument-equalizer-alist} +in der Datei @file{../scm/midi.scm} entnehmen. + +Dieser grundlegende Equalizer kann ersetzt werden, indem die +Funktion @code{instrumentEqualizer} im @code{Score}-Kontext auf +eine neue Scheme-Funktion gesetzt wird, die MIDI-Instrumentbezeichnungen +als einziges Argument akzeptiert und ein Zahlenpaar ausgibt, das +den Höchst- und Mindestwert für die Lautstärke des entpsrechenden +Instruments darstellt. Die Ersetzung der Standardfunktion wird +auf gleiche Weise vorgenommen, wie es schon für die +@code{dynamicAbsoluteVolumeFunction} zu Beginn dieses Abschnittes +gezeigt wurde. Der Standard-Equalizer, +@notation{default-instrument-equalizer} in der Datei +@file{../scm/midi.scm} zeigt, wie solche eine Funktion erstellt werden +kann. + +Das folgende Beispiel definiert für die Flöte und Klarinette relative +Lautstärkewerte, die denen des vorigen Beispiels entsprechen. + +@lilypond[verbatim,quote] +#(define my-instrument-equalizer-alist '()) + +#(set! my-instrument-equalizer-alist + (append + '( + ("flute" . (0.7 . 0.9)) + ("clarinet" . (0.3 . 0.6))) + my-instrument-equalizer-alist)) + +#(define (my-instrument-equalizer s) + (let ((entry (assoc s my-instrument-equalizer-alist))) + (if entry + (cdr entry)))) + +\score { + << + \new Staff { + \key g \major + \time 2/2 + \set Score.instrumentEqualizer = #my-instrument-equalizer + \set Staff.midiInstrument = #"flute" + \new Voice \relative c''' { + r2 g\mp g fis ~ + fis4 g8 fis e2 ~ + e4 d8 cis d2 + } + } + \new Staff { + \key g \major + \set Staff.midiInstrument = #"clarinet" + \new Voice \relative c'' { + b1\p a2. b8 a + g2. fis8 e + fis2 r + } + } + >> + \layout { } + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 72 2) + } + } +} +@end lilypond + + + @node Percussion in MIDI @subsection Percussion in MIDI -@untranslated +Schlagzeuginstrumente werden üblicherweise in einem @code{DrumStaff}-Kontext +notiert. Aus diese Weise werden sie korrekt in den MIDI-Kanal@tie{}10 +ausgegeben. Eine Schlagzeuge mit diskreten Tonhöhen, wie Xylophon, +Marima, Vibraphone, Pauken usw. werden wie @qq{normale} Instrumente +in einem @code{Staff}-Kontext notiert. Nur so lässt sich auch hier +eine richtige MIDI-Ausgabe erreichen. + +Einige Instrumente, die keine diskreten Tonhöhen haben, können nicht +über den MIDI-Kanal@tie{}10 erreicht werden und müssen deshalb in +einem normalen @code{Staff}-Kontext notiert werden. Es handelt sich +um @code{melodic tom, taiko drum, synth drum} usw. + +Viele Schlagzeuginstrumnete sind nicht in den MIDI-Standard aufgenommen, +z. B. Kastagnetten. Die einfachste Methode, derartige Instrumente +zu ersetzen, ist, einen Klang auszuwählen, der ihnen halbwegs ähnlich +kommt. + + +@knownissues + +Weil der MIDI-Standard keine Peitschenschläge kennt, wird ein +Schlagstock (sidestick) für diesen Zweck eingesetzt. diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely index db7eb91e40..befb553346 100644 --- a/Documentation/de/user/keyboards.itely +++ b/Documentation/de/user/keyboards.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -612,10 +612,10 @@ repeats} @seealso Notationsreferenz: -@ruser{Tremolo repeats} -@ruser{Glissando} -@ruser{Arpeggio} -@ruser{Harmonics} +@ref{Tremolo repeats} +@ref{Glissando} +@ref{Arpeggio} +@ref{Harmonics} @@ -657,5 +657,5 @@ Trenner. Ein @code{o} vor der Definition umrandet das Symbol. @seealso Notationsreferenz: -@ruser{Text scripts} -@ruser{Instrument Specific Markup} +@ref{Text scripts} +@ref{Instrument Specific Markup}. diff --git a/Documentation/de/user/notation-appendices.itely b/Documentation/de/user/notation-appendices.itely index 38219d460e..bd8b18cadd 100644 --- a/Documentation/de/user/notation-appendices.itely +++ b/Documentation/de/user/notation-appendices.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -197,11 +197,11 @@ halbverminderte Septime @tab Verminderter Dreklang, kleine Sept @tab -@code{dim5m7} +@code{m7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:dim5m7 + c1:m7.5- } @end lilypond @@ -210,11 +210,11 @@ Kleine MollSept @tab Molldreiklang, Durseptime @tab -@code{7m5} +@code{maj7.5-} @tab @lilypond[line-width=3\cm,noragged-right, notime] \chordmode { - c1:7m5 + c1:maj7.5- } @end lilypond @@ -245,7 +245,7 @@ Molldreiklang, Sexte @end lilypond @item -Dominantnon +Dominantnone @tab Dominantsept, große None @tab @@ -260,7 +260,7 @@ Dominantsept, große None @item Dur None @tab -TODO +Große None, große Septime @tab @code{maj9} @tab @@ -273,7 +273,7 @@ TODO @item Moll None @tab -TODO +Große None, kleine Septime @tab @code{m9} @tab @@ -284,9 +284,9 @@ TODO @end lilypond @item -Dominantundecime +Dominantundezime @tab -Dominant ninth, perfect eleventh +Dominantnone, perfekte Undezime @tab @code{11} @tab @@ -297,9 +297,9 @@ Dominant ninth, perfect eleventh @end lilypond @item -Durundecime +Durundezime @tab -TODO +Große None, perfekte Unidezime @tab @code{maj11} @tab @@ -310,9 +310,9 @@ TODO @end lilypond @item -Mollundecime +Mollundezime @tab -TODO +Kleine None, perfekte Undezime @tab @code{m11} @tab @@ -325,7 +325,18 @@ TODO @item Dominant-13 @tab -Dominant eleventh, major thirteenth +Dominantnone, große 13 +@tab +@code{13} +@tab +@lilypond[line-width=3\cm,noragged-right, notime] +\chordmode { + c1:13 +} +@end lilypond + +@item +Dominant-13 @tab @code{13.11} @tab @@ -338,7 +349,7 @@ Dominant eleventh, major thirteenth @item Dur-13 @tab -TODO +Große Undezime, große 13 @tab @code{maj13.11} @tab @@ -351,7 +362,7 @@ TODO @item Moll-13 @tab -TODO +Kleine Undezime, große 13 @tab @code{m13.11} @tab @@ -362,9 +373,9 @@ TODO @end lilypond @item -erniedrigte Sekunde +Sekundakkord @tab -TODO +große Sekunde, perfekte Quinte @tab @code{sus2} @tab @@ -375,9 +386,9 @@ TODO @end lilypond @item -erniedrigte Quarte +Quartakkord @tab -TODO +perfekte Quarte, perfekte Quinte @tab @code{sus4} @tab diff --git a/Documentation/de/user/percussion.itely b/Documentation/de/user/percussion.itely index bb903f9059..6366b88fb8 100644 --- a/Documentation/de/user/percussion.itely +++ b/Documentation/de/user/percussion.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -388,8 +388,6 @@ down = \drummode { bd4 sn bd toml8 toml } @snippets -FIXME: MOVE ALL THESE TO LSR! -gp - Hier einige Beispiele: Zwei Holzblöcke, notiert mit wbh (hoch) und wbl (tief) diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely index 58524d2d48..db594dd961 100644 --- a/Documentation/de/user/pitches.itely +++ b/Documentation/de/user/pitches.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/programming-interface.itely b/Documentation/de/user/programming-interface.itely index a170c3ab46..f3c546adbb 100644 --- a/Documentation/de/user/programming-interface.itely +++ b/Documentation/de/user/programming-interface.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: b4a63b6e388283e2f2ac73c3c99da205d209e28a + Translation of GIT committish: 8405b88e6c1aac6c44e6064dd7b8b1674d6e7abd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/spacing.itely b/Documentation/de/user/spacing.itely index 305daf1b69..f503633684 100644 --- a/Documentation/de/user/spacing.itely +++ b/Documentation/de/user/spacing.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/staff.itely b/Documentation/de/user/staff.itely index 57b3877ea2..be933e8fef 100644 --- a/Documentation/de/user/staff.itely +++ b/Documentation/de/user/staff.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 2c00bdbfaf62dd90863331c4713e6b29e32c9322 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/de/user/tweaks.itely b/Documentation/de/user/tweaks.itely index 4ddd69f300..44d8486609 100644 --- a/Documentation/de/user/tweaks.itely +++ b/Documentation/de/user/tweaks.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -404,11 +404,12 @@ Beachten Sie, dass die Syntax des @code{\tweak}-Befehls sich von der des @code{\override}-Befehls unterscheidet. Weder Kontext noch Layout-Objekt konnen angegeben werden, denn das würde zu einem Fehler führen. Beide Angaben sind -durch das folgende Element impliziert. Die verallgemeinerte +durch das folgende Element impliziert. Hier sollte auch +kein Gleichheitzeichen vorhanden sein. Die verallgemeinerte Syntax des @code{\tweak}-Befehls ist also einfach @example -\tweak #'@var{layout-eigenschaft} = #@var{Wert} +\tweak #'@var{layout-eigenschaft} #@var{Wert} @end example Ein @code{\tweak}-Befehl kann auch benutzt werden, um nur diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/user/vocal.itely index f8ac124513..5410bf5eec 100644 --- a/Documentation/de/user/vocal.itely +++ b/Documentation/de/user/vocal.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 4770e4e71ebff6104cad46bd2d889c3ff6ba3875 + Translation of GIT committish: 23342b5b9f69f3a82751052f79f3fede0bb40ded When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/es/translations.html.in b/Documentation/es/translations.html.in index 6cd8928998..c303cb891d 100644 --- a/Documentation/es/translations.html.in +++ b/Documentation/es/translations.html.in @@ -1,4 +1,4 @@ -

Actualizado en Sun Dec 21 09:36:02 UTC 2008 +

Actualizado en Sun Dec 28 01:18:10 UTC 2008

pre-GDP - 2.4 Instrumentos de cuerda con trastes
(1830) + 2.4 Instrumentos de cuerda con trastes
(1850) Francisco Vila sí @@ -332,7 +332,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.7 Notación de acordes
(1398) + 2.7 Notación de acordes
(1464) Francisco Vila sí @@ -340,7 +340,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.8 Notación antigua
(4486) + 2.8 Notación antigua
(4487) Francisco Vila sí diff --git a/Documentation/es/user/ancient.itely b/Documentation/es/user/ancient.itely index 1ac8c137d9..1d897040d1 100644 --- a/Documentation/es/user/ancient.itely +++ b/Documentation/es/user/ancient.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: d5bd12a5775832e81000fb901ad65283a152eaa4 + Translation of GIT committish: 0f749d4980bcd5d633037336f1a91472ab710a8d When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -723,7 +723,7 @@ No existen silencios de fusa y semifusa específicos para los estilos mensural ni neo-mensural. En su lugar se tomarán los silencios del estilo predeterminado. -Consulte @rlsr{Pitches,rests} para ver un cuadro de todos los +Consulte @rlsr{Ancient notation} para ver un cuadro de todos los silencios. diff --git a/Documentation/es/user/chords.itely b/Documentation/es/user/chords.itely index 33c9bc9afe..e543453cd1 100644 --- a/Documentation/es/user/chords.itely +++ b/Documentation/es/user/chords.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: bc4543c30c67f02dadc392880f27d4581e2d7681 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -147,7 +147,12 @@ Se pueden crear acordes de séptima: @funindex m La tabla que aparece más abajo muestra el efecto de los modificadores -de variante sobre los acordes de tríada y de séptima. +de variante sobre los acordes de tríada y de séptima. La séptima +añadida de forma predeterminada a los acordes es menor, lo que hace +del acorde de séptima dominante el acorde básico de séptima. Todas +las alteraciones se consideran en relación con la séptima dominante. +Hay una tabla más completa donde aparecen los usos de los +modificadores en @ref{Common chord modifiers}. @c @table @code @multitable @columnfractions .2 .4 .3 @@ -174,8 +179,7 @@ Acción predeterminada; produce una tríada mayor. @item m, m7 @tab -Acorde menor. Este modificador baja la tercera y, si existe, la -séptima. +Acorde menor. Este modificador baja la tercera. @tab @lilypond[line-width=4\cm, noragged-right] \chordmode { @@ -256,11 +260,12 @@ acorde y añadir un bajo distinto o crear una inversión. El primer número que sigue al @code{:} se considera que es el ámbito del acorde. El acorde se construye secuencialmente añadiendo terceras -a la fundamental hasta que se alcanza el número especificado. Si el -ámbito no es una tercera (p.ej. 6), se añaden terceras hasta la -tercera más alta inferior al ámbito, y después se añade la nota del -ámbito. El mayor valor posible para el ámbito es 13. Cualquier valor -mayor se interpreta como 13. +a la fundamental hasta que se alcanza el número especificado. Observe +que la séptima añadida como parte de un acorde extendido es la séptima +menor, no mayor. Si el ámbito no es una tercera (p.ej. 6), se añaden +terceras hasta la tercera más alta inferior al ámbito, y después se +añade la nota del ámbito. El mayor valor posible para el ámbito es +13. Cualquier valor mayor se interpreta como 13. @lilypond[quote,ragged-right,fragment,verbatim,relative=1] \chordmode { @@ -288,7 +293,8 @@ con una trecena sin alteración, se elimina la oncena de los acordes de @cindex adiciones en acordes Se pueden añadir notas individuales a un acorde. Las adiciones siguen -el ámbito y van prefijadas por un punto (@code{.}). +el ámbito y van prefijadas por un punto (@code{.}). La séptima normal +que se añade a un acorde es la séptima menor, no mayor. @lilypond[quote,verbatim,fragment,relative=1] \chordmode { diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely index 673fee001e..46e666ddc1 100644 --- a/Documentation/es/user/fretted-strings.itely +++ b/Documentation/es/user/fretted-strings.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: ac8805d20e179145e3f3371032fe54156d84b0d0 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -933,7 +933,9 @@ Además de los diagramas de traste, LilyPond almacena una lista interna de formas de acorde. Las formas de acorde son diagramas de traste que se pueden desplazar por el mástil para dar acordes distintos. Se pueden añadir formas de acorde a la lista interna y luego usarlas para -definir diagramas de traste predefinidos. Como los diagramas de +definir diagramas de posición predefinidos. Dado que se pueden mover +a distintas posiciones dentro del mástil, las formas de acorde +normalmente no contienen cuerdas al aire. Como los diagramas de posiciones, las formas de acorde se pueden introducir como cadenas escuetas fret-diagram-terse o como listas de marcado prolijas fret-diagram-verbose. diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely index 41aa42de3a..b541007002 100644 --- a/Documentation/es/user/keyboards.itely +++ b/Documentation/es/user/keyboards.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 93485c0ecbda3b3e8fc7232f86f689e68f9ebd51 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -625,10 +625,10 @@ repeats} @seealso Referencia de la notación: -@ruser{Tremolo repeats}, -@ruser{Glissando}, -@ruser{Arpeggio}, -@ruser{Harmonics}. +@ref{Tremolo repeats}, +@ref{Glissando}, +@ref{Arpeggio}, +@ref{Harmonics}. @node Harp pedals @unnumberedsubsubsec Harp pedals @@ -670,5 +670,5 @@ una elipse. @seealso Referencia de la notación: -@ruser{Text scripts}, -@ruser{Instrument Specific Markup}. +@ref{Text scripts}, +@ref{Instrument Specific Markup}. diff --git a/Documentation/es/user/lilypond-program.tely b/Documentation/es/user/lilypond-program.tely index f6601089a6..d4608eca6a 100644 --- a/Documentation/es/user/lilypond-program.tely +++ b/Documentation/es/user/lilypond-program.tely @@ -172,7 +172,7 @@ en línea de la presente documentación y de otras. @menu * Install:: Cómo instalarlo o compilarlo. -* Setup:: Utilizar LilyPond con notros programas. +* Setup:: Utilizar LilyPond con otros programas. * Running LilyPond:: Funcionamiento. * LilyPond-book:: Integrar texto y música. * Converting from other formats:: Convertir al formato del código de entrada de lilypond. diff --git a/Documentation/es/user/repeats.itely b/Documentation/es/user/repeats.itely index b12dc1ba3a..52e78c3bb6 100644 --- a/Documentation/es/user/repeats.itely +++ b/Documentation/es/user/repeats.itely @@ -30,7 +30,7 @@ repeticiones con finales alternativos. @item unfold (desplegada) Las música repetida se escribe y se interpreta completamente tantas veces como especifique el valor @var{número_de_repeticiones}. Es útil -cuando se estáescribiendo música repetitiva. +cuando se está escribiendo música repetitiva. @item percent (porcentaje) Hacer repeticiones de compases o parte de ellos. Tienen un aspecto diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely index f0a6a16cba..2ddd8b5e49 100644 --- a/Documentation/es/user/rhythms.itely +++ b/Documentation/es/user/rhythms.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @ignore - Translation of GIT committish: 17d84cfa9ddb152b05d1e17ab72109fb4eefa684 + Translation of GIT committish: 4f8c7b381812949e6f765f641fba9108b52af56b When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -52,8 +52,8 @@ ejemplo, una negra se escribe usando un @code{4} (puesto que es 1/4 de redonda), mientras que una blanca se escribe con un @code{2} (por ser 1/2 de redonda). Para notas mayores de la redonda se deben usar los comandos @code{\longa} (que es una breve doble) y @code{\breve}. Se -pueden especificar duraciones tan cortas como la semifusa (con el -número 64). Son posibles valores más cortos, pero sólo como notas +pueden especificar duraciones tan cortas como la garrapatea (con el +número 128). Son posibles valores más cortos, pero sólo como notas unidas por una barra. @c Two 64th notes are needed to obtain beams @@ -875,7 +875,7 @@ La indicación de compás se imprime al comienzo de una pieza y siempre que hay un cambio de compás. Si se produce un cambio al final de una línea, se imprime una indicación de advertencia en dicho lugar. Se puede modificar este comportamiento predeterminado, véase -@ref{Controlling visibility of objects}. +@ref{Visibility of objects}. @lilypond[quote,verbatim,relative=2] \time 2/4 diff --git a/Documentation/es/user/staff.itely b/Documentation/es/user/staff.itely index f73d2a0d56..5517f60c2d 100644 --- a/Documentation/es/user/staff.itely +++ b/Documentation/es/user/staff.itely @@ -406,7 +406,7 @@ ajuste afecta también al espaciado de las líneas adicionales. { a4 b c d } @end lilypond -Hay más detalles sobre las proopiedades de @code{StaffSymbol} en +Hay más detalles sobre las propiedades de @code{StaffSymbol} en @rinternals{staff-symbol-interface}. @funindex \startStaff diff --git a/Documentation/fr/translations.html.in b/Documentation/fr/translations.html.in index 3d2c8affe5..c529d083cb 100644 --- a/Documentation/fr/translations.html.in +++ b/Documentation/fr/translations.html.in @@ -1,4 +1,4 @@ -

Dernière mise à jour Sun Dec 21 09:36:02 UTC 2008 +

Dernière mise à jour Sun Dec 28 01:18:10 UTC 2008

2 Environnement de travail
(1149) + Jean-Charles Malahieude - - non - + oui + N/A pré-GDP @@ -195,7 +195,7 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude oui - partiellement + N/A pré-GDP @@ -335,7 +335,7 @@ translations.template.html.in; DO NOT EDIT !--> pré-GDP - 2.4 Instruments à cordes frettées
(1830) + 2.4 Instruments à cordes frettées
(1850) Valentin Villenave Jean-Charles Malahieude
John Mandereau @@ -362,7 +362,7 @@ translations.template.html.in; DO NOT EDIT !--> pré-GDP - 2.7 Notation des accords
(1398) + 2.7 Notation des accords
(1464) Valentin Villenave Jean-Charles Malahieude
John Mandereau @@ -371,7 +371,7 @@ translations.template.html.in; DO NOT EDIT !--> pré-GDP - 2.8 Notations anciennes
(4486) + 2.8 Notations anciennes
(4487) John Mandereau
Jean-Charles Malahieude @@ -409,16 +409,16 @@ translations.template.html.in; DO NOT EDIT !--> 5 Modification des réglages prédéfinis
(11391) Valentin Villenave Gilles Thibault - partiellement (33 %) + partiellement (42 %) partiellement pré-GDP 6 Interfaces pour les programmeurs
(5202) - - - non - + Valentin Villenave + Gilles Thibault + partiellement (9 %) + partiellement pré-GDP diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/user/changing-defaults.itely index df2187bb60..59c6253639 100644 --- a/Documentation/fr/user/changing-defaults.itely +++ b/Documentation/fr/user/changing-defaults.itely @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- -@c This file is part of ../user/lilypond.tely +@c This file is part of lilypond.tely @ignore Translation of GIT committish: 76de7e168dbc9ffc7671d99663c5ce50dae42abb @@ -12,6 +12,7 @@ @c Translators: Valentin Villenave @c Translation checkers: Gilles Thibault + @node Changing defaults @chapter Changing defaults @@ -34,7 +35,7 @@ référence du programme @ref{Top,Référence du programme,,lilypond-internals}. @end ifnottex Ce guide répertorie toutes les variables, fonctions et autres options que -LilyPond met à votre disposition. Il est consultable +LilyPond met à votre disposition. Il est consultable @c leave the @uref as one long line. @uref{http://@/lilypond@/.org/@/doc/@/stable/@/Documentation/@/user/@/lilypond@/-internals/,en@tie{}ligne}, au format HTML, mais est également inclus dans la documentation @@ -48,7 +49,7 @@ La notation automatique, ce qui revient à modifier la manière dont les éléme de notation sont automatiquement créés -- par exemple, les règles de ligatures. @item -L'apparence, qui se rapporte aux objets pris individuellement -- ainsi de la direction +L'apparence, qui se rapporte aux objets pris individuellement -- ainsi de la direction des hampes, du placement des indications textuelles. @item @@ -64,164 +65,98 @@ En sous-main, LilyPond se sert du langage Scheme (un dérivé du LISP) comme infrastructure. Modifier les choix de mise en page revient à pénétrer dans les entrailles du programme, et de ce fait requiert l'emploi du Scheme. Les fragments de Scheme, dans un fichier @code{.ly}, sont introduits par le -caractère @q{hash}, (@code{#}, improprement surnommé @q{dièse}).@footnote{Le +caractère @q{hash}, (@code{#}, improprement surnommé @q{dièse}).@footnote{Le @rlearning{Scheme tutorial} fournit quelques notions de base pour saisir des nombres, des listes, des chaînes de caractères ou des symboles, en Scheme.} @menu -* Interpretation contexts:: -* The override command:: +* Interpretation contexts:: +* Explaining the Internals Reference:: +* Modifying properties:: +* Useful concepts and properties:: +* Advanced tweaks:: @end menu - @node Interpretation contexts @section Interpretation contexts Cette section traite des contextes. @menu -* Contexts explained:: -* The set command:: -* Modifying context plug-ins:: -* Layout tunings within contexts:: -* Changing context default settings:: -* Defining new contexts:: -* Aligning contexts:: -* Vertical grouping of grobs:: +* Contexts explained:: +* Creating contexts:: +* Modifying context plug-ins:: +* Layout tunings within contexts:: +* Changing context default settings:: +* Defining new contexts:: +* Aligning contexts:: @end menu - @node Contexts explained @subsection Contexts explained -@untranslated - - -@node The set command -@subsection The @code{\set} command - -@cindex propriétés -@funindex \set -@cindex modifier des propriétés - -Chaque contexte peut avoir plusieurs @emph{propriétés}, c'est-à-dire -des variables qu'il inclut. Ces dernières peuvent être modifiées @qq{à la volée}, -c'est-à-dire pendant que la compilation s'accomplit. C'est là le rôle de la -commande @code{\set}. - -@example -\set @var{contexte}.@var{propriété} = #@var{valeur} -@end example - -Ainsi : -@lilypond[quote,verbatim,relative=2,fragment] -R1*2 -\set Score.skipBars = ##t -R1*2 -@end lilypond - -Cette commande permet de condenser les mesures vides de notes, en des silences -multi-mesures. Il s'agit d'un objet Scheme, auquel on attribue la valeur booléenne -@q{vrai}, c'est-à-dire la lettre @code{#t} pour @q{True} en anglais. - -Ce changement étant appliqué @q{à la volée}, il n'affecte que le second groupe de notes. - -Si l'argument @var{contexte} n'est pas spécifié, alors la propriété cherchera à s'appliquer -dans le contexte le plus restreint où elle est employée : le plus souvent - @code{ChordNames}, @code{Voice}, ou @code{Lyrics}. Dans l'exemple suivant, - -@lilypond[quote,verbatim,relative=2,fragment] -c8 c c c -\set autoBeaming = ##f -c8 c c c -@end lilypond +@ignore +@c TODO Rethink and rewrite + +>> > > - list of contexts: my *danger unmaintainable* +>> > > alarm just went off. I'm + +I knew it would... And leaving out some of them is perfectly fine +with me. +I do think that a list like this, with the main contexts and a +brief +description of what they do (perhaps also with a note about what +default +behavior is associated with each of them, but this may be +unmanageable), +should be there, and then we could simply list the remaining ones +without +further explanation and with links to the IR. +@end ignore -@noindent -aucun argument @var{contexte} n'a été donné à la commande @code{\set}. -De ce fait, les ligatures automatiques sont désactivées dans le -contexte actuel, c'est-à-dire @rinternals{Voice}. Notez que le -contexte le plus restreint n'est pas toujours le bon, -et peut ne pas contenir la propriété qui vous intéresse : ainsi, la propriété -@code{skipBars}, évoquée plus haut, ne relève pas du contexte @code{Voice}, -et le code suivant ne fonctionnera pas. +@c TODO Improve layout, order and consistency of wording -td -@lilypond[quote,verbatim,relative=2,fragment] -R1*2 -\set skipBars = ##t -R1*2 -@end lilypond +@c TODO Add introduction which explains contexts in generality -td -Les contextes s'organisent de façon hiérarchique : aussi, lorsqu'un contexte de niveau -supérieur est spécifié (par exemple @code{Staff}), la propriété sera modifée dans -tous les contextes inférieurs (tous les contextes @code{Voice}, par exemple) -qu'il contient. +@c TODO Describe propagation of property values -td -@funindex \unset -La commande @code{\unset} permet d'annuler la définition d'une propriété : +@menu +* Score - the master of all contexts:: +* Top-level contexts - staff containers:: +* Intermediate-level contexts - staves:: +* Bottom-level contexts - voices:: +@end menu -@example -\unset @var{contexte}.@var{propriété} -@end example +@node Score - the master of all contexts +@unnumberedsubsubsec Score - the master of all contexts -@noindent -si et seulement si cette propriété à été définie dans ce @var{contexte} -précis ; ainsi, +@untranslated -@example -\set Staff.autoBeaming = ##f -@end example -@noindent -même s'il s'applique à tous les contextes @code{Voice} contenus dans le -contexte @code{Staff}, ne peut être annulé au niveau @code{Voice}. Le code -suivant sera sans effet. +@node Top-level contexts - staff containers +@unnumberedsubsubsec Top-level contexts - staff containers -@example -\unset Voice.autoBeaming -@end example +@untranslated -@noindent -En d'autres termes, la commande @code{\unset} doit impérativement être -accompagnée du même contexte que la commande @code{\set} d'origine. -Pour annuler l'effet, dans notre exemple, de @code{Staff.autoBeaming = ##f}, -il faut donc entrer : -@example -\unset Staff.autoBeaming -@end example -Si l'on se trouve dans le contexte le plus restreint, il n'est pas obligatoire, -là encore, de spécifier le @var{contexte}. Ainsi, les deux lignes suivantes sont équivalentes. +@node Intermediate-level contexts - staves +@unnumberedsubsubsec Intermediate-level contexts - staves +@untranslated -@example -\set Voice.autoBeaming = ##t -\set autoBeaming = ##t -@end example +@node Bottom-level contexts - voices +@unnumberedsubsubsec Bottom-level contexts - voices -@cindex \once -Pour modifier une propriété de façon à ce qu'elle ne s'applique qu'une seule fois, -il convient d'employer la commande @code{\once} : +@untranslated -@lilypond[quote,verbatim,relative=2,fragment] -c4 -\once \set fontSize = #4.7 -c4 -c4 -@end lilypond -Ici le changement de taille est annulé aussitôt après la note concernée. +@node Creating contexts +@subsection Creating contexts -La référence du programme contient une description exhaustive de toutes les -propriétés contexte par contexte : voir -@ifhtml -@rinternals{Tunable context properties}. -@end ifhtml -@ifnothtml -Translation @expansion{} Tunable context properties. -@end ifnothtml +@untranslated @node Modifying context plug-ins @@ -301,7 +236,7 @@ La clé et le chiffre de mesure ont disparu de la deuxième portée. C'est une quelque peu radicale, puisqu'elle affectera toute la portée jusqu'à la fin de la partition. L'espacement s'en trouve également affecté, ce qui peut être ou non l'effet recherché. Une méthode plus sophistiquée aurait été de rendre ces objets -transparents (voir @rlearning{Common tweaks}). +transparents (voir @rlearning{Visibility and color of objects}). Dans l'exemple suivant, voici une mise en pratique plus utile. En temps normal, les barres de mesure et la métrique sont synchronisées verticalement @@ -336,6 +271,7 @@ En les enlevant du contexte @code{Score} pour les attribuer au contexte @end lilypond +@c deprecated node: delete. --fv @node Layout tunings within contexts @subsection Layout tunings within contexts @@ -363,7 +299,7 @@ La commande suivante : @end verbatim @noindent -rend les hampes plus épaisses (la valeur par défaut est 1.3, ce qui signifie qu'elles +rend les hampes plus épaisses (la valeur par défaut est 1.3, ce qui signifie qu'elles sont 1,3 fois plus épaisses que les lignes de la portée). Dans la mesure où nous avons indiqué @code{Staff} comme contexte, ce réglage ne s'appliquera qu'à la portée courante ; les autres portées demeureront intactes. @@ -594,7 +530,7 @@ squashedPosition = #0 @end example @noindent -Le graveur @rinternals{Pitch_squash_engraver} intercepte les notes créées par +Le graveur @rinternals{Pitch_squash_engraver} intercepte les notes créées par @rinternals{Note_heads_engraver}, et les @q{écrase} pour qu'elles aient toutes la même position verticale, définie par @code{squashedPosition} : ici il s'agit de la valeur@tie{}@code{0}, c'est-à-dire la ligne du milieu. @@ -685,6 +621,7 @@ On peut alors saisir la musique, comme dans l'exemple plus haut : @node Aligning contexts @subsection Aligning contexts + Il est possible d'aligner verticalement chaque nouveau contexte, en-dessous ou au-dessus, par exemple dans le cas de musique vocale (@rlearning{Vocal ensembles}) ou d'@qq{ossias}. @@ -707,93 +644,17 @@ ossia = { f4 f f f } @end lilypond -@node Vertical grouping of grobs -@subsection Vertical grouping of grobs - -Les objets @code{VerticalAlignment} et @code{VerticalAxisGroup} -travaillent de concert. Comme leurs noms anglais l'indiquent, -@code{VerticalAxisGroup} regroupe différents objets tels que les portées -(@code{Staff}), les paroles (@code{Lyrics}) et ainsi de suite ; puis -@code{VerticalAlignment} synchronise verticalement ces différents groupes. -En général, il n'y a qu'un seul @code{VerticalAlignment} pour l'ensemble -de la partition, mais chaque contexte @code{Staff}, @code{Lyrics}, etc. -possède son propre @code{VerticalAxisGroup}. - - -@node The override command -@section The @code{\override} command - -La commande @code{\override} permet de modifier la mise en page -en détail. Examinons son utilisation concrètementet dans les détails. -La syntaxe de cette commande ressemble généralement à : - -@example -\override @var{contexte}.@var{objet} #'@var{propriété} = #@var{valeur} -@end example +@node Explaining the Internals Reference +@section Explaining the Internals Reference -La propriété @var{propriété} de l'objet @var{objet}, appartenant au contexte -@var{contexte}, se voit ainsi attribuer la valeur @var{valeur}. @menu -* Constructing a tweak:: -* Navigating the program reference:: -* Layout interfaces:: -* Determining the grob property:: -* The tweak command:: -* Using Scheme code instead of tweak:: -* set versus override:: -* Difficult tweaks:: +* Navigating the program reference:: +* Layout interfaces:: +* Determining the grob property:: +* Naming conventions:: @end menu - - -@node Constructing a tweak -@subsection Constructing a tweak - -Les commandes permettant de modifier l'apparence de la partition -ressemblent en général à - -@example -\override Voice.Stem #'thickness = #3.0 -@end example - -@noindent -Pour élaborer un réglage de ce type, on a besoin de connaître précisément : - -@itemize -@item le contexte : ici @code{Voice} (la voix). -@item l'objet à affecter : ici @code{Stem} (les hampes). -@item la propriété à modifier : ici @code{thickness} (l'épaisseur du trait). -@item la valeur désirée : ici @code{3.0} (par défaut, elle est de 1.3). -@end itemize - -Certaines @q{sous-propriétés} sont parfois contenues dans une propriété. -La commande devient alors : - -@example -\override Stem #'(details beamed-lengths) = #'(4 4 3) -@end example - -@cindex documentation exhaustive -@cindex trouver des objets graphiques -@cindex objets graphiques, description -@cindex régler -@funindex \override - -Pour bien des propriétés, quel que soit le type de valeur requise, -attribuer la valeur @q{faux} (@code{##f} en Scheme) reviendra à désactiver -complètement l'action de la propriété qui se trouve ainsi purement -ignorée par LilyPond. Cela peut s'avérer fort utile pour des propriétés -causant des désagréments. - -@c such announcements are to be avoided -vv -@ignore -We demonstrate how to glean this information from the notation manual -and the program reference. -@end ignore - - - @node Navigating the program reference @subsection Navigating the program reference @@ -865,7 +726,7 @@ Fingering objects are created by: @rinternals{Fingering_engraver} and @rinternals{New_fingering_engraver}. @end quotation -En d'autres termes, @emph{Les indications de doigtés} +En d'autres termes, @emph{Les indications de doigtés} (@code{Fingering} en anglais) @emph{sont créées par les graveurs @rinternals{Fingering_engraver} et @rinternals{New_fingering_engraver}.} @@ -889,7 +750,7 @@ Music event type @code{fingering-event} is in Music expressions named Ce cheminement se produit, bien sûr, en sens inverse : nous sommes ici partis du résultat, et avons abouti aux évènements (en anglais @q{Events}) engendrés par le fichier d'entrée. L'inverse est également possible : on peut partir d'un -évènement, et suivre le cheminement de LilyPond qui aboutit à la création d'un +évènement, et suivre le cheminement de LilyPond qui aboutit à la création d'un ou plusieurs objets graphiques. La référence du programme peut également se parcourir comme un document normal. @@ -901,7 +762,7 @@ On y trouve des chapitres tels que @code{Music definitions} @end ifnothtml @rinternals{Translation}, ou encore @rinternals{Backend}. Chaque chapitre -recense toutes les définitions employées, et les propriétés sujettes à +recense toutes les définitions employées, et les propriétés sujettes à ajustements. @c -- what about adding a link to the glossary here ? -vv @@ -988,7 +849,7 @@ Cet objet admet les interfaces suivantes : Suit la liste des interfaces en question, présentées comme autant de liens, qui conduisent sur les pages dédiées à chacune d'entre elles. Chaque interface est dotée d'un certain nombre de propriétés, dont certaines -peuvent être modifiées, et d'autres non (les @q{Internal properties}, ou +peuvent être modifiées, et d'autres non (les @q{Internal properties}, ou propriétés internes). Pour aller encore plus loin, plutôt que de simplement parler de l'objet @@ -1025,9 +886,11 @@ son âme même, dans les fichiers source de LilyPond (voir amas de variables et de réglages. La page de la Référence du programme est en fait directement engendrée par cette définition. + @node Determining the grob property @subsection Determining the grob property + Nous voulions changer la position du chiffre @b{2} dans le fragment suivant : @lilypond[quote,fragment,relative=2,verbatim] @@ -1074,7 +937,7 @@ Add this much extra space between objects that are next to each other. @noindent Ce qui signifie -@quotation +@quotation Ajouter tel espace supplémentaire entre des objets proches les uns des autres. @end quotation @@ -1113,105 +976,279 @@ Le graveur Fingering_engraver fait partie des contextes : @dots{} @rinternals{Vo @end quotation -@node The tweak command -@subsection The @code{\tweak} command +@node Naming conventions +@subsection Naming conventions -@funindex \tweak +@untranslated -Dans certains cas, on peut passer par un raccourci pour arranger les -objets graphiques. Lorsqu'un objet est directement engendré par un élément distinct -du fichier source, on peut utiliser la commande @code{\tweak}. -Dans l'accord suivant, les notes sont modifiées une par une : +@node Modifying properties +@section Modifying properties -@lilypond[relative=2,fragment,verbatim,ragged-right] -< - c - \tweak #'color #red d - g - \tweak #'duration-log #1 a ->4-\tweak #'padding #10 -. -@end lilypond +@c TODO change the menu and subsection node names to use +@c backslash once the new macro to handle the refs +@c is available. Need to find and change all refs at +@c the same time. -td -Comme on peut le voir, les propriétés sont ici modifiées directement -en même temps que les objets sont saisis. Il n'est plus besoin de spécifier ni -le nom de l'objet (@emph{grob}), ni le contexte dans lequel cela doit s'appliquer. +@menu +* Overview of modifying properties:: +* The set command:: +* The override command:: +* Constructing a tweak:: +* The tweak command:: +* set versus override:: +@end menu -Ce procédé ne marche que pour des objets directement liés aux évènements -(@rinternals{Event}) du fichier source. Par exemple : +@node Overview of modifying properties +@subsection Overview of modifying properties -@itemize @bullet -@item Les têtes de notes au sein d'un accord, qui sont directement engendrées par -les hauteurs indiquées -@item Les signes d'articulation, engendrés par les indications de ponctuation. -@end itemize +@untranslated -En revanche, les hampes ou les altérations sont engendrées par les têtes de notes, -et non par des évènements dans le fichier source. De même pour les clés, qui ne -sont pas directement engendrées par le fichier source, mais plutôt par le -changement d'une propriété interne. -En fait, très peu d'objets passent @emph{directement} du code source à la partition. -Une note toute simple, par exemple @code{c4}, fait l'objet d'un traitement et n'est donc -pas directement rendue ; c'est pourquoi le code suivant ne sera d'aucun effet : +@node The set command +@subsection The @code{\set} command + +@cindex propriétés +@funindex \set +@cindex modifier des propriétés + +Chaque contexte peut avoir plusieurs @emph{propriétés}, c'est-à-dire +des variables qu'il inclut. Ces dernières peuvent être modifiées @qq{à la volée}, +c'est-à-dire pendant que la compilation s'accomplit. C'est là le rôle de la +commande @code{\set}. @example -\tweak #'color #red c4 +\set @var{contexte}.@var{propriété} = #@var{valeur} @end example -@noindent -Voir pour plus de détails @ref{Displaying music expressions}. +Ainsi : +@lilypond[quote,verbatim,relative=2,fragment] +R1*2 +\set Score.skipBars = ##t +R1*2 +@end lilypond +Cette commande permet de condenser les mesures vides de notes, en des silences +multi-mesures. Il s'agit d'un objet Scheme, auquel on attribue la valeur booléenne +@q{vrai}, c'est-à-dire la lettre @code{#t} pour @q{True} en anglais. -@node Using Scheme code instead of tweak -@subsection Using Scheme code instead of @code{\tweak} +Ce changement étant appliqué @q{à la volée}, il n'affecte que le second groupe de notes. -L'inconvénient principal de la commande @code{\tweak} est la rigidité de sa -syntaxe. Par exemple, le code suivant produit une erreur. +Si l'argument @var{contexte} n'est pas spécifié, alors la propriété cherchera à s'appliquer +dans le contexte le plus restreint où elle est employée : le plus souvent + @code{ChordNames}, @code{Voice}, ou @code{Lyrics}. Dans l'exemple suivant, + +@lilypond[quote,verbatim,relative=2,fragment] +c8 c c c +\set autoBeaming = ##f +c8 c c c +@end lilypond + +@noindent +aucun argument @var{contexte} n'a été donné à la commande @code{\set}. +De ce fait, les ligatures automatiques sont désactivées dans le +contexte actuel, c'est-à-dire @rinternals{Voice}. Notez que le +contexte le plus restreint n'est pas toujours le bon, +et peut ne pas contenir la propriété qui vous intéresse : ainsi, la propriété +@code{skipBars}, évoquée plus haut, ne relève pas du contexte @code{Voice}, +et le code suivant ne fonctionnera pas. + +@lilypond[quote,verbatim,relative=2,fragment] +R1*2 +\set skipBars = ##t +R1*2 +@end lilypond + +Les contextes s'organisent de façon hiérarchique : aussi, lorsqu'un contexte de niveau +supérieur est spécifié (par exemple @code{Staff}), la propriété sera modifée dans +tous les contextes inférieurs (tous les contextes @code{Voice}, par exemple) +qu'il contient. + +@funindex \unset + +La commande @code{\unset} permet d'annuler la définition d'une propriété : @example -F = \tweak #'font-size #-3 -\flageolet +\unset @var{contexte}.@var{propriété} +@end example -\relative c'' @{ - c4^\F c4_\F -@} +@noindent +si et seulement si cette propriété à été définie dans ce @var{contexte} +précis ; ainsi, + +@example +\set Staff.autoBeaming = ##f @end example @noindent -En d'autres termes, @code{\tweak} ne se comporte pas comme une articulation : -il ne peut notamment pas être accolé avec les symboles @samp{^} ou @samp{_}. +même s'il s'applique à tous les contextes @code{Voice} contenus dans le +contexte @code{Staff}, ne peut être annulé au niveau @code{Voice}. Le code +suivant sera sans effet. -C'est en se servant du langage Scheme que l'on peut résoudre ce problème. -Dans cet exemple, on a recours aux méthodes décrites dans @ref{Adding -articulation to notes (example)}, en particulier quant à l'emploi de -@code{\displayMusic}. +@example +\unset Voice.autoBeaming +@end example +@noindent +En d'autres termes, la commande @code{\unset} doit impérativement être +accompagnée du même contexte que la commande @code{\set} d'origine. +Pour annuler l'effet, dans notre exemple, de @code{Staff.autoBeaming = ##f}, +il faut donc entrer : @example -F = #(let ((m (make-music 'ArticulationEvent - 'articulation-type "flageolet"))) - (set! (ly:music-property m 'tweaks) - (acons 'font-size -3 - (ly:music-property m 'tweaks))) - m) - -\relative c'' @{ - c4^\F c4_\F -@} +\unset Staff.autoBeaming +@end example + +Si l'on se trouve dans le contexte le plus restreint, il n'est pas obligatoire, +là encore, de spécifier le @var{contexte}. Ainsi, les deux lignes suivantes sont équivalentes. + + +@example +\set Voice.autoBeaming = ##t +\set autoBeaming = ##t +@end example + + +@cindex \once +Pour modifier une propriété de façon à ce qu'elle ne s'applique qu'une seule fois, +il convient d'employer la commande @code{\once} : + +@lilypond[quote,verbatim,relative=2,fragment] +c4 +\once \set fontSize = #4.7 +c4 +c4 +@end lilypond + +Ici le changement de taille est annulé aussitôt après la note concernée. + +La référence du programme contient une description exhaustive de toutes les +propriétés contexte par contexte : voir +@ifhtml +@rinternals{Tunable context properties}. +@end ifhtml +@ifnothtml +Translation @expansion{} Tunable context properties. +@end ifnothtml + + +@node The override command +@subsection The @code{\override} command + + +La commande @code{\override} permet de modifier la mise en page +en détail. Examinons son utilisation concrètementet dans les détails. +La syntaxe de cette commande ressemble généralement à : + +@example +\override @var{contexte}.@var{objet} #'@var{propriété} = #@var{valeur} +@end example + +La propriété @var{propriété} de l'objet @var{objet}, appartenant au contexte +@var{contexte}, se voit ainsi attribuer la valeur @var{valeur}. + + +@c deprecated node. Delete. --fv +@node Constructing a tweak +@subsection Constructing a tweak + +Les commandes permettant de modifier l'apparence de la partition +ressemblent en général à + +@example +\override Voice.Stem #'thickness = #3.0 @end example @noindent -Ici les propriétés @code{tweak} de l'objet flageolet nommé -@samp{m} (créé au moyen de @code{make-music}) sont extraites par -@code{ly:music-property}, une nouvelle valeur de la taille de fonte -est ajoutée à la liste de ses propriétés (grâce à la fonction Scheme -@code{acons}), et le résultat de cette opération est renvoyé par @code{set!}. -Le dernier élément, dans ce bloc @code{let}, est la valeur finale de -@samp{m} lui-même. +Pour élaborer un réglage de ce type, on a besoin de connaître précisément : + +@itemize +@item le contexte : ici @code{Voice} (la voix). +@item l'objet à affecter : ici @code{Stem} (les hampes). +@item la propriété à modifier : ici @code{thickness} (l'épaisseur du trait). +@item la valeur désirée : ici @code{3.0} (par défaut, elle est de 1.3). +@end itemize + +Certaines @q{sous-propriétés} sont parfois contenues dans une propriété. +La commande devient alors : + +@example +\override Stem #'(details beamed-lengths) = #'(4 4 3) +@end example + +@cindex documentation exhaustive +@cindex trouver des objets graphiques +@cindex objets graphiques, description +@cindex régler +@funindex \override + +Pour bien des propriétés, quel que soit le type de valeur requise, +attribuer la valeur @q{faux} (@code{##f} en Scheme) reviendra à désactiver +complètement l'action de la propriété qui se trouve ainsi purement +ignorée par LilyPond. Cela peut s'avérer fort utile pour des propriétés +causant des désagréments. + +@c such announcements are to be avoided -vv +@ignore +We demonstrate how to glean this information from the notation manual +and the program reference. +@end ignore + + +@node The tweak command +@subsection The @code{\tweak} command + + +@funindex \tweak + +Dans certains cas, on peut passer par un raccourci pour arranger les +objets graphiques. Lorsqu'un objet est directement engendré par un élément distinct +du fichier source, on peut utiliser la commande @code{\tweak}. + +Dans l'accord suivant, les notes sont modifiées une par une : + +@lilypond[relative=2,fragment,verbatim,ragged-right] +< + c + \tweak #'color #red d + g + \tweak #'duration-log #1 a +>4-\tweak #'padding #10 -. +@end lilypond + +Comme on peut le voir, les propriétés sont ici modifiées directement +en même temps que les objets sont saisis. Il n'est plus besoin de spécifier ni +le nom de l'objet (@emph{grob}), ni le contexte dans lequel cela doit s'appliquer. + +Ce procédé ne marche que pour des objets directement liés aux évènements +(@rinternals{Event}) du fichier source. Par exemple : + +@itemize @bullet +@item Les têtes de notes au sein d'un accord, qui sont directement engendrées par +les hauteurs indiquées +@item Les signes d'articulation, engendrés par les indications de ponctuation. +@end itemize + +En revanche, les hampes ou les altérations sont engendrées par les têtes de notes, +et non par des évènements dans le fichier source. De même pour les clés, qui ne +sont pas directement engendrées par le fichier source, mais plutôt par le +changement d'une propriété interne. + +En fait, très peu d'objets passent @emph{directement} du code source à la partition. +Une note toute simple, par exemple @code{c4}, fait l'objet d'un traitement et n'est donc +pas directement rendue ; c'est pourquoi le code suivant ne sera d'aucun effet : + +@example +\tweak #'color #red c4 +@end example + +@noindent +Voir pour plus de détails @ref{Displaying music expressions}. @node set versus override @subsection @code{\set} vs. @code{\override} + Si les propriétés peuvent être modifiées de deux façons, par les commandes @code{\set} et @code{\override}, c'est qu'il y a deux types de propriétés. @@ -1260,90 +1297,207 @@ courante, une propriété spéciale a été créée. Elle doit être modifiée avec la commande @code{\set}. -@node Difficult tweaks -@subsection Difficult tweaks -Certains réglages sont plus délicats que d'autres. +@node Useful concepts and properties +@section Useful concepts and properties -@itemize @bullet +@menu +* Input modes:: +* Direction and placement:: +* Distances and measurements:: +* Staff symbol properties:: +* Spanners:: +* Visibility of objects:: +* Line styles:: +* Rotating objects:: +@end menu -@item -L'un d'entre eux est l'apparence des objets dits @q{spanner}, qui s'étendent -horizontalement, tels que les liaisons. Si, en principe, un seul de ces objets -est créé à la fois et peut donc être modifié de façon habituelle, lorsque ces -objets doivent enjamber un changement de ligne, ils sont dupliqués au début -du ou des systèmes suivants. Comme ces objets sont des clones de l'objet d'origine, -ils en héritent toutes les propriétés, y compris les éventuelles commandes @code{\override}. +@node Input modes +@subsection Input modes +@untranslated -En d'autres termes, une commande @code{\override} affecte toujours les deux extrémités -d'un objet @q{spanner}. Pour ne modifier que la partie précédant ou suivant le changement -de ligne, il faut intervenir directement dans le processus de mise en page. -La fonction de rappel @code{after-line-breaking} contient toute l'opération Scheme -effectuée lorsque les sauts de lignes ont été déterminés, et que des objets graphiques -ont été divisés sur des systèmes différents. -Dans l'exemple suivant, on définit une nouvelle opération nommée -@code{my-callback}. Cette opération +@node Direction and placement +@subsection Direction and placement -@itemize @bullet -@item -détermine si l'objet a été divisé à l'occasion d'un changement de ligne -@item -si oui, recherche les différents morceaux de l'objet -@item -vérifie si l'objet considéré est bien la deuxième moitié d'un objet divisé -@item -si oui, applique un espacement supplémentaire (@code{extra-offset}). -@end itemize +@untranslated -On ajoute cette procédure à l'objet @rinternals{Tie} (liaison de tenue), -de façon à ce que le deuxième morceau d'une liaison divisée soit rehaussé. -@c KEEP LY -@lilypond[quote,verbatim,ragged-right] -#(define (my-callback grob) - (let* ( - ; l'objet a-t-il été divisé ? - (orig (ly:grob-original grob)) +@node Distances and measurements +@subsection Distances and measurements - ; si oui, rechercher les morceaux frères (siblings) - (siblings (if (ly:grob? orig) - (ly:spanner-broken-into orig) '() ))) +@untranslated - (if (and (>= (length siblings) 2) - (eq? (car (last-pair siblings)) grob)) - (ly:grob-set-property! grob 'extra-offset '(-2 . 5))))) -\relative c'' { - \override Tie #'after-line-breaking = - #my-callback - c1 ~ \break c2 ~ c -} -@end lilypond +@node Staff symbol properties +@subsection Staff symbol properties -@noindent -Lorsque cette astuce va être appliquée, notre nouvelle fonction de rappel -@code{after-line-breaking} devra également appeler celle d'origine -(@code{after-line-breaking}), si elle existe. -Ainsi, pour l'utiliser dans le cas d'un crescendo (objet @code{Hairpin}), -il faudra appeler également @code{ly:hairpin::after-line-breaking}. +@untranslated -@item Pour des raisons d'ordre technique, certains objets ne peuvent être modifiés par -@code{\override}. Parmi ceux-là, les objets @code{NonMusicalPaperColumn} -et @code{PaperColumn}. La commande @code{\overrideProperty} sert à les modifier, de -façon similaire à @code{\once \override}, mais avec une syntaxe différente : +@node Spanners +@subsection Spanners -@example -\overrideProperty -#"Score.NonMusicalPaperColumn" % Nom de l'objet -#'line-break-system-details % Nom de la propriété -#'((next-padding . 20)) % valeur -@end example +@untranslated -Notez cependant que la commande @code{\override} peut tout de même être appliquée -à @code{NoteMusicalPaperColumn} et @code{PaperColumn} dans un bloc @code{\context}. -@end itemize +@unnumberedsubsubsec Using the @code{spanner-interface} +@unnumberedsubsubsec Using the @code{line-spanner-interface} +@node Visibility of objects +@subsection Visibility of objects + +@untranslated + + +@menu +* Removing the stencil:: +* Making objects transparent:: +* Painting objects white:: +* Using break-visibility:: +* Special considerations:: +@end menu + +@node Removing the stencil +@unnumberedsubsubsec Removing the stencil + +@untranslated + + +@node Making objects transparent +@unnumberedsubsubsec Making objects transparent + +@untranslated + + +@node Painting objects white +@unnumberedsubsubsec Painting objects white + +@untranslated + + +@node Using break-visibility +@unnumberedsubsubsec Using break-visibility + +@untranslated + + +@node Special considerations +@unnumberedsubsubsec Special considerations + +@untranslated + + +@node Line styles +@subsection Line styles + +@untranslated + + +@node Rotating objects +@subsection Rotating objects + +@untranslated + + +@menu +* Rotating layout objects:: +* Rotating markup:: +@end menu + +@node Rotating layout objects +@unnumberedsubsubsec Rotating layout objects + +@untranslated + + +@node Rotating markup +@unnumberedsubsubsec Rotating markup + +@untranslated + + +@node Advanced tweaks +@section Advanced tweaks + +@untranslated + + +@menu +* Aligning objects:: +* Vertical grouping of grobs:: +* Modifying stencils:: +* Modifying shapes:: +@end menu + +@node Aligning objects +@subsection Aligning objects + +@untranslated + + +@menu +* Setting @code{X-offset} and @code{Y-offset} directly:: +* Using the @code{side-position-interface}:: +* Using the @code{self-alignment-interface}:: +* Using the @code{break-alignable-interface}:: +@end menu + +@node Setting @code{X-offset} and @code{Y-offset} directly +@unnumberedsubsubsec Setting @code{X-offset} and @code{Y-offset} directly + +@untranslated + + +@node Using the @code{side-position-interface} +@unnumberedsubsubsec Using the @code{side-position-interface} + +@untranslated + + +@node Using the @code{self-alignment-interface} +@unnumberedsubsubsec Using the @code{self-alignment-interface} + +@untranslated + + +@unnumberedsubsubsec Using the @code{aligned-on-parent} procedures +@unnumberedsubsubsec Using the @code{centered-on-parent} procedures +@node Using the @code{break-alignable-interface} +@unnumberedsubsubsec Using the @code{break-alignable-interface} + +@untranslated + + +@node Vertical grouping of grobs +@subsection Vertical grouping of grobs + +Les objets @code{VerticalAlignment} et @code{VerticalAxisGroup} +travaillent de concert. Comme leurs noms anglais l'indiquent, +@code{VerticalAxisGroup} regroupe différents objets tels que les portées +(@code{Staff}), les paroles (@code{Lyrics}) et ainsi de suite ; puis +@code{VerticalAlignment} synchronise verticalement ces différents groupes. +En général, il n'y a qu'un seul @code{VerticalAlignment} pour l'ensemble +de la partition, mais chaque contexte @code{Staff}, @code{Lyrics}, etc. +possède son propre @code{VerticalAxisGroup}. + + +@node Modifying stencils +@subsection Modifying stencils + +@untranslated + + +@node Modifying shapes +@subsection Modifying shapes + +@menu +* Modifying ties and slurs:: +@end menu + +@node Modifying ties and slurs +@unnumberedsubsubsec Modifying ties and slurs + +@untranslated + diff --git a/Documentation/fr/user/converters.itely b/Documentation/fr/user/converters.itely index c0bbeb6741..00c46756e2 100644 --- a/Documentation/fr/user/converters.itely +++ b/Documentation/fr/user/converters.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 27af34a245b02a6b89c9af3becefcfe676b2e19d + Translation of GIT committish: 1e2013ba299c3640143448cbd5ea72f2aa61e380 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -21,9 +21,11 @@ permettent de générer du code LilyPond, comme par exemple des séquenceurs en mode graphique ou des convertisseurs XML. Pour plus de détails, rendez-vous sur le @uref{http://@/lilypond@/.org,site}. -Il s'agit de programmes distincts de lilypond qui se lancent en ligne -de commande. Pour plus de précisions, reportez-vous à @ref{Command-line -usage}. +Il s'agit de programmes distincts de @command{lilypond} qui se lancent +en ligne de commande. Pour plus de précisions, reportez-vous au +chapitre @ref{Command-line usage}. Si vous utilisez MacOS 10.3 ou 10.4 +et recontrez quelque problème avec l'un de ces scripts, comme +@code{convert-ly}, reportez-vous au chapitre @ref{Setup for MacOS X}. @knownissues @@ -64,7 +66,7 @@ convertisseur capable d'importer directement un fichier. (@rinternals{Voice}). Les hauteurs sont rendues en mode relatif, et les durées spécifiées lorsque nécessaire. -Vous pouvez enregistrer un fichier MIDI grace à un clavier +Vous pouvez enregistrer un fichier MIDI grâce à un clavier électronique et ensuite le convertir en fichier @file{.ly}. Néanmoins le rythme humain n'a pas une précision suffisante pour qu'une conversion MIDI à ly ne se fasse sans surprise. En le couplant à une @@ -77,12 +79,12 @@ manuellement. Pour le lancer en ligne de commande, procédez ainsi : @example -midi2ly [@var{option}]@dots{} @var{midi-file} +midi2ly [@var{option}]@dots{} @var{fichier-midi} @end example Notez bien que, par @qq{ligne de commande}, nous parlons de la ligne de -commande du système. Pour plus de détails, voir -@ref{Converting from other formats}. +commande du système. Pour plus de précisions, reportez-vous à +@ref{Command-line usage}. @command{midi2ly} accepte les options suivantes : @@ -101,14 +103,14 @@ Afficher un résumé des utilisations. @item -k, --key=@var{acc}[:@var{minor}] Déterminer la tonalité par défaut. @math{@var{acc} > 0} fixe le -nombre de dièses ; @math{@var{acc} < 0} le nombre de bémols. Un ton -mineur est spécifié par l'emploi de @samp{:1}. +nombre de dièses ; @math{@var{acc} < 0} le nombre de bémols. Une +tonalité mineure est spécifiée par l'emploi de @code{:1}. @item -o, --output=@var{file} Générer le résultat dans le fichier @var{file}. @item -s, --start-quant=@var{DUR} -Quantiser le début des notes sur DUR. +Quantiser le début des notes sur @var{DUR}. @item -t, --allow-tuplet=@var{DUR}*@var{NUM}/@var{DEN} Accepter des n-olets de valeur @var{DUR}*@var{NUM}/@var{DEN}. @@ -137,56 +139,102 @@ ajoutez une indication de phrasé ou de pédale. @node Invoking musicxml2ly @section Invoking @code{musicxml2ly} -@uref{http://@/www.@/recordare@/.com/xml@/.html,MusicXML} est un +@cindex MusicXML + +@uref{http://@/www.@/musicxml@/.org/,MusicXML} est un dialecte XML pour représenter la notation musicale. -@command{musicxml2ly} extrait des notes à partir de fichiers MusicXML, +@command{musicxml2ly} extrait, à partir d'un fichier MusicXML, les +notes, articulations, structure de la partition, paroles, etc. et les écrit dans un fichier @var{.ly}. Il se lance en ligne de commande. +Pour le lancer en ligne de commande, procédez ainsi : +@example +musicxml2ly [@var{option}]@dots{} @var{fichier-xml} +@end example + Notez bien que, par @qq{ligne de commande}, nous parlons de la ligne de -commande du système. Pour plus de détails, voir -@ref{Converting from other formats}. +commande du système. Pour plus de précisions, reportez-vous à +@ref{Command-line usage}. + +Si le nom du fichier est @file{-}, @command{musicxml2ly} lira +directement à partir de la ligne de commande. @command{musicxml2ly} accepte les options suivantes : @table @code +@item -a, --absolute +Rendu en hauteurs absolues. + @item -h,--help Afficher un résumé des utilisations. -@item -o,--output=@var{file} -Générer le résultat dans le fichier @var{file}. (par défaut : -affichage écran) -@item -v,--version + +@item -l, --language=LANG +Utiliser un autre fichier de définition liguistique @file{LANG.ly} +et les noms de notes correspondants, comme par exemple +@var{deutsch} pour @file{deutsch.ly} et noms de notes en allemand. + +@item --lxml +Utiliser le paquetage Python lxml.etree, moins gourmand en mémoire et +temps de calcul, pour effectuer l'annalyse XML. + +@item --nd --no-articulation-directions +Ne pas convertir la direction (@code{^}, @code{_} ou @code{-}) des +articulations, nuances, etc. + +@item --no-beaming +Ne pas convertir les informations de ligature ; laisser LilyPond gérer +les ligatures automatiquement. + +@item -o,--output=@var{fichier} +Générer le résultat dans le fichier @var{fichier}. S'il n'est pas +déterminé, ce sera @var{fichier-xml}@file{.ly} ; @file{-} produira le +résultat sur la sortie standard (@var{stdout}). + +@item -r,--relative +Rendu en hauteurs relatives (mode par défaut). + +@item -v,--verbose +Mode verbeux. + +@item --version Afficher le numéro de version. + +@item -z,--compressed +Le fichier d'entrée est un fichier MusicXML zippé. @end table + @node Invoking abc2ly @section Invoking @code{abc2ly} @cindex ABC ABC est un format relativement simple basé sur l'ASCII. Sa -description est disponible sur le site d'ABC à l'adresse : - -@quotation -@uref{http://@/www@/.walshaw@/.plus@/.com/@/abc/@/abc2mtex/@/abc@/.txt}. -@end quotation +description est disponible sur le +@uref{http://@/www@/.walshaw@/.plus@/.com/@/abc/@/learn@/.html,site +d'ABC}. -@command{abc2ly} traduit du formt ABC au format LilyPond. +@command{abc2ly} traduit du format ABC au format LilyPond. Pour le lancer en ligne de commande, procédez ainsi : @example -abc2ly [@var{option}]@dots{} @var{abc-file} +abc2ly [@var{option}]@dots{} @var{fichier-abc} @end example @command{abc2ly} accepte les options suivantes : @table @code +@item -b,--beams=None +Préserver la notion de lien de croches propre à ABC. @item -h,--help Afficher un résumé des utilisations. @item -o,--output=@var{file} Générer le résultat dans le fichier @var{file}. -@item -v,--version +@item -s,--strict +Être strict sur la réussite. +@item --version Afficher le numéro de version. @end table @@ -197,7 +245,7 @@ source ABC. Ainsi, l'assertion %%LY voices \set autoBeaming = ##f @end example -aura pour conséquence d'insérer le texte qui suit le mot-clé @q{voices} +aura pour conséquence d'insérer le texte qui suit le mot-clé @qq{voices} dans la voix correspondante du fichier LilyPond. De la même manière, @@ -206,12 +254,12 @@ De la même manière, %%LY slyrics more words @end example -placera le texte suivant le mot-clé @q{slyrics} dans une ligne de paroles. +placera le texte suivant le mot-clé @qq{slyrics} dans une ligne de paroles. @knownissues -Le standard ABC n'est pas si @q{standard} que cela. Pour des +Le standard ABC n'est pas si @qq{standard} que cela. Pour des fonctionnalités étendues, comme la polyphonie, existent différentes conventions. @@ -223,7 +271,6 @@ ABC synchronise paroles et musique en début de ligne ; @command{abc2ly} ignore les ligatures ABC. - @node Invoking etf2ly @section Invoking @command{etf2ly} @@ -239,23 +286,21 @@ convertit partiellement les fichiers ETF en fichiers source LilyPond. Pour le lancer en ligne de commande, procédez ainsi : @example -midi2ly [@var{option}]@dots{} @var{midi-file} +etf2ly [@var{option}]@dots{} @var{fichier-etf} @end example Notez bien que, par @qq{ligne de commande}, nous parlons de la ligne de -commande du système. Pour plus de détails, voir -@ref{Converting from other formats}. +commande du système. Pour plus de précisions, reportez-vous à +@ref{Command-line usage}. -@command{midi2ly} accepte les options suivantes : +@command{etf2ly} accepte les options suivantes : @table @code @item -h,--help Afficher cette aide. - @item -o, --output=@var{file} Générer le résultat dans le fichier @var{file}. - -@item -v, --version +@item --version Afficher le numéro de version. @end table @@ -263,7 +308,7 @@ Afficher le numéro de version. @knownissues La liste des scripts d'articulation est incomplète. Les mesures vides -perturbent @command{etf2ly}. Les séquences ne notes d'ornement ne se +perturbent @command{etf2ly}. Les séquences de notes d'ornement ne se terminent pas de manière satisfaisante. @@ -278,9 +323,9 @@ outils indépendants permettent de générer des fichiers LilyPond. Nous citerons entre autres -@itemize @bullet +@itemize @item -@uref{http://@/denemo@/.sourceforge@/.net/,Denemo}, une interface +@uref{http://@/denemo@/.org,Denemo}, une interface graphique pour l'édition de partition. @item @uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, un @@ -289,16 +334,24 @@ convertisseur temps-réel de MIDI monophonique à LilyPond. @uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, un mode majeur pour Emacs. @item -@uref{http://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, qui importe -@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML} +@uref{http://@/www@/.nongnu@/.org/@/xml2ly/, xml2ly}, qui importe du +@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}. @item @uref{http://@/noteedit@/.berlios@/.de,NoteEdit} -qui importe @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML} +qui importe du @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}. @item @uref{http://@/www@/.rosegardenmusic@/.com,Rosegarden}, -qui importe MIDI +qui importe du MIDI. @item @uref{http://@/common-lisp@/.net/project/fomus/,FOMUS}, une bibliothèque LISP pour générer de la notation musicale. +@item +@uref{http://@/vsr@/.informatik@/.tu-chemnitz@/.de/staff/jan/nted/nted.xhtml,NtEd} +assure, de manière expérimentale, un export vers LilyPond. +@item +@uref{http://@/www@/.tuxguitar@/.com@/.ar/,TuxGuitar} peut exporter au +format LilyPond. +@item +@uref{http://@/musescore@/.org,MuseScore} peut exporter au format LilyPond. @end itemize diff --git a/Documentation/fr/user/programming-interface.itely b/Documentation/fr/user/programming-interface.itely index 32b672bdd2..96de874a51 100644 --- a/Documentation/fr/user/programming-interface.itely +++ b/Documentation/fr/user/programming-interface.itely @@ -1,12 +1,17 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: 76de7e168dbc9ffc7671d99663c5ce50dae42abb When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.11.65" + +@c Translators: Valentin Villenave +@c Translation checkers: Gilles Thibault + @node Interfaces for programmers @chapter Interfaces for programmers @@ -15,12 +20,14 @@ @menu -* Music functions:: -* Programmer interfaces:: -* Building complicated functions:: -* Markup programmer interface:: -* Contexts for programmers:: -* Scheme procedures as properties:: +* Music functions:: +* Programmer interfaces:: +* Building complicated functions:: +* Markup programmer interface:: +* Contexts for programmers:: +* Scheme procedures as properties:: +* Using Scheme code instead of tweak:: +* Difficult tweaks:: @end menu @node Music functions @@ -30,13 +37,13 @@ @menu -* Overview of music functions:: -* Simple substitution functions:: -* Paired substitution functions:: -* Mathematics in functions:: -* Void functions:: -* Functions without arguments:: -* Overview of available music functions:: +* Overview of music functions:: +* Simple substitution functions:: +* Paired substitution functions:: +* Mathematics in functions:: +* Void functions:: +* Functions without arguments:: +* Overview of available music functions:: @end menu @node Overview of music functions @@ -89,8 +96,8 @@ @menu -* Input variables and Scheme:: -* Internal music representation:: +* Input variables and Scheme:: +* Internal music representation:: @end menu @node Input variables and Scheme @@ -112,10 +119,10 @@ @menu -* Displaying music expressions:: -* Music properties:: -* Doubling a note with slurs (example):: -* Adding articulation to notes (example):: +* Displaying music expressions:: +* Music properties:: +* Doubling a note with slurs (example):: +* Adding articulation to notes (example):: @end menu @node Displaying music expressions @@ -149,10 +156,10 @@ @menu -* Markup construction in Scheme:: -* How markups work internally:: -* New markup command definition:: -* New markup list command definition:: +* Markup construction in Scheme:: +* How markups work internally:: +* New markup command definition:: +* New markup list command definition:: @end menu @node Markup construction in Scheme @@ -186,8 +193,8 @@ @menu -* Context evaluation:: -* Running a function on all layout objects:: +* Context evaluation:: +* Running a function on all layout objects:: @end menu @node Context evaluation @@ -207,4 +214,142 @@ @untranslated -@c -- SKELETON FILE -- + +@menu +* Using Scheme code instead of tweak:: +* Difficult tweaks:: +@end menu + +@node Using Scheme code instead of tweak +@section Using Scheme code instead of @code{\tweak} + +L'inconvénient principal de la commande @code{\tweak} est la rigidité de sa +syntaxe. Par exemple, le code suivant produit une erreur. + +@example +F = \tweak #'font-size #-3 -\flageolet + +\relative c'' @{ + c4^\F c4_\F +@} +@end example + +@noindent +En d'autres termes, @code{\tweak} ne se comporte pas comme une articulation : +il ne peut notamment pas être accolé avec les symboles @samp{^} ou @samp{_}. + +C'est en se servant du langage Scheme que l'on peut résoudre ce problème. +Dans cet exemple, on a recours aux méthodes décrites dans @ref{Adding +articulation to notes (example)}, en particulier quant à l'emploi de +@code{\displayMusic}. + +@example +F = #(let ((m (make-music 'ArticulationEvent + 'articulation-type "flageolet"))) + (set! (ly:music-property m 'tweaks) + (acons 'font-size -3 + (ly:music-property m 'tweaks))) + m) + +\relative c'' @{ + c4^\F c4_\F +@} +@end example + +@noindent +Ici les propriétés @code{tweak} de l'objet flageolet nommé +@samp{m} (créé au moyen de @code{make-music}) sont extraites par +@code{ly:music-property}, une nouvelle valeur de la taille de fonte +est ajoutée à la liste de ses propriétés (grâce à la fonction Scheme +@code{acons}), et le résultat de cette opération est renvoyé par @code{set!}. +Le dernier élément, dans ce bloc @code{let}, est la valeur finale de +@samp{m} lui-même. + + +@node Difficult tweaks +@section Difficult tweaks + +Certains réglages sont plus délicats que d'autres. + +@itemize @bullet + + +@item +L'un d'entre eux est l'apparence des objets dits @q{spanner}, qui s'étendent +horizontalement, tels que les liaisons. Si, en principe, un seul de ces objets +est créé à la fois et peut donc être modifié de façon habituelle, lorsque ces +objets doivent enjamber un changement de ligne, ils sont dupliqués au début +du ou des systèmes suivants. Comme ces objets sont des clones de l'objet d'origine, +ils en héritent toutes les propriétés, y compris les éventuelles commandes @code{\override}. + + +En d'autres termes, une commande @code{\override} affecte toujours les deux extrémités +d'un objet @q{spanner}. Pour ne modifier que la partie précédant ou suivant le changement +de ligne, il faut intervenir directement dans le processus de mise en page. +La fonction de rappel @code{after-line-breaking} contient toute l'opération Scheme +effectuée lorsque les sauts de lignes ont été déterminés, et que des objets graphiques +ont été divisés sur des systèmes différents. + +Dans l'exemple suivant, on définit une nouvelle opération nommée +@code{my-callback}. Cette opération + +@itemize @bullet +@item +détermine si l'objet a été divisé à l'occasion d'un changement de ligne +@item +si oui, recherche les différents morceaux de l'objet +@item +vérifie si l'objet considéré est bien la deuxième moitié d'un objet divisé +@item +si oui, applique un espacement supplémentaire (@code{extra-offset}). +@end itemize + +On ajoute cette procédure à l'objet @rinternals{Tie} (liaison de tenue), +de façon à ce que le deuxième morceau d'une liaison divisée soit rehaussé. + +@c KEEP LY +@lilypond[quote,verbatim,ragged-right] +#(define (my-callback grob) + (let* ( + ; l'objet a-t-il été divisé ? + (orig (ly:grob-original grob)) + + ; si oui, rechercher les morceaux frères (siblings) + (siblings (if (ly:grob? orig) + (ly:spanner-broken-into orig) '() ))) + + (if (and (>= (length siblings) 2) + (eq? (car (last-pair siblings)) grob)) + (ly:grob-set-property! grob 'extra-offset '(-2 . 5))))) + +\relative c'' { + \override Tie #'after-line-breaking = + #my-callback + c1 ~ \break c2 ~ c +} +@end lilypond + +@noindent +Lorsque cette astuce va être appliquée, notre nouvelle fonction de rappel +@code{after-line-breaking} devra également appeler celle d'origine +(@code{after-line-breaking}), si elle existe. +Ainsi, pour l'utiliser dans le cas d'un crescendo (objet @code{Hairpin}), +il faudra appeler également @code{ly:hairpin::after-line-breaking}. + + +@item Pour des raisons d'ordre technique, certains objets ne peuvent être modifiés par +@code{\override}. Parmi ceux-là, les objets @code{NonMusicalPaperColumn} +et @code{PaperColumn}. La commande @code{\overrideProperty} sert à les modifier, de +façon similaire à @code{\once \override}, mais avec une syntaxe différente : + +@example +\overrideProperty +#"Score.NonMusicalPaperColumn" % Nom de l'objet +#'line-break-system-details % Nom de la propriété +#'((next-padding . 20)) % valeur +@end example + +Notez cependant que la commande @code{\override} peut tout de même être appliquée +à @code{NoteMusicalPaperColumn} et @code{PaperColumn} dans un bloc @code{\context}. + +@end itemize diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/user/setup.itely index c0e9ea2e81..973eb12925 100644 --- a/Documentation/fr/user/setup.itely +++ b/Documentation/fr/user/setup.itely @@ -1,18 +1,23 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea + Translation of GIT committish: 1e2013ba299c3640143448cbd5ea72f2aa61e380 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.11.61" + +@c Translators: Jean-Charles Malahieude @node Setup @chapter Setup -@untranslated - +Ce chapitre traite des options de configuration à effectuer après +l'installation de LilyPond et de ses dépendances. Il tient lieu de +référence en la matière : ne vous intéressez qu'à la rubrique qui vous +concerne directement. @menu * Setup for specific Operating Systems:: @@ -23,24 +28,106 @@ @node Setup for specific Operating Systems @section Setup for specific Operating Systems -@untranslated - +Cette partie explique comment optimiser l'installation propres à +certains systèmes. @menu -* MacOS X on the command-line:: +* Setup for MacOS X:: @end menu -@node MacOS X on the command-line -@subsection MacOS X on the command-line +@node Setup for MacOS X +@subsection Setup for MacOS X + +@subsubheading Using Python scripts on MacOS 10.3 or 10.4 + +Les exécutables de LilyPond pour MacOS X ne fournissent pas Python, bien +qu'une version au moins de niveau 2.4 soit requise par +@command{convert-ly}. Ainsi, et si vous utilisez MacOS 10.3 ou 10.4, +devrez-vous installer une version plus récente de Python à partir de +@uref{http://python.org/download/}, puis éditer la première ligne de +@command{convert-ly} et @command{lilypond-book}. Si les exécutables du +Python que vous venez d'installer sont dans votre @var{PATH}, cette ligne +doit être : + +@example +#!/usr/bin/env python +@end example + +@noindent +et dans le cas contraire + +@example +#!@var{/chemin/vers/nouvelle_installation/python} +@end example + + +@subsubheading MacOS X on the command line + +Les scripts tels que @command{lilypond-book}, @command{convert-ly}, +@command{abc2ly}, et même @command{lilypond}, sont insclus dans un +fichier @code{.app} pour MacOS@tie{}X. Vous pourrez les lancer +directement en ligne de commande de la manière suivante : + +@example +@var{chemin/vers}/LilyPond.app/Contents/Resources/bin/lilypond +@end example + +@noindent +Il en va de même pour les autres scripts de ce répertoire, y compris +@command{lilypond-book}, @command{convert-ly}, @command{abc2ly}, etc. + +Une autre façon de procéder consiste à créer des scripts qui ajoutent +automatiquement le chemin. À cette intention, créez un répertoire qui +contiendra ces scripts : + +@example +mkdir -p ~/bin +cd ~/bin +@end example + +Créez un fichier appelé @code{lilypond} et qui contiendra : + +@example +exec @var{chemin/vers}/LilyPond.app/Contents/Resources/bin/lilypond "$@@" +@end example + +Créez autant de fichiers -- @code{lilypond-book}, @code{convert-ly}, et +autres programmes annexes que vous utilisez (@code{abc2ly}, +@code{midi2ly}, etc) -- que de besoin. Remplacez simplement +@code{bin/lilypond} par @code{bin/convert-ly} ou tout autre nom de +programme dans le fichier que vous créez. -@untranslated +Rendez ces fichiers exécutables : + +@example +chmod u+x lilypond +@end example + +Ajoutez alors ce répertoire à votre @var{PATH}. Modifiez le fichier +@code{.profile} -- créez-le si besoin -- de votre répertoire personnel, +de telle sorte qu'il contienne + +@example +export PATH=$PATH:~/bin +@end example + +@noindent +Ce fichier doit se terminer par une ligne vide. + +Notez que @var{chemin/vers} devrait correspondre à @code{/Applications/}. @node Text editor support @section Text editor support -@untranslated +@cindex editors +@cindex vim +@cindex emacs +@cindex modes, editor +@cindex syntax coloring +@cindex coloring, syntax +Certains éditeurs de texte prennent en charge LilyPond. @menu * Emacs mode:: @@ -54,44 +141,210 @@ @node Emacs mode @subsection Emacs mode -@untranslated +Emacs dispose d'un @file{lilypond-mode} qui fournit l'autocomplétion des +mots-clés, l'indentation, les appariements spécifiques à LilyPond, la +coloration synthaxique, ainsi que des raccourcis pour compiler et +consulter les manuels de LilyPond en mode info. Si le +@file{lilypond-mode} n'était pas installé sur votre système, procédez +comme ci-dessous. + +Le répertoire @file{elisp} inclus dans les sources contient aussi un +mode pour saisir la musique et lancer LilyPond. Faites @command{make +install} pour l'installer dans votre @var{elispdir}. Le fichier +@file{lilypond-init.el} devrait trouver sa place dans +@var{load-path}@file{/site-start.d/} ou bien ajouté à votre +@file{~/.emacs} ou @file{~/.emacs.el}. + +En tant que simple utilisateur, vous pouvez toujours ajouter votre +propre répertoire (par exemple @file{~/site-lisp/}) à votre +@var{load-path} en ajoutant la ligne suivante -- modifiée en conséquence +-- à votre @file{~/.emacs} : + +@c any reason we do not advise: (push "~/site-lisp" load-path) +@example +(setq load-path (append (list (expand-file-name "~/site-lisp")) load-path)) +@end example @node Vim mode @subsection Vim mode -@untranslated +En ce qui concerne @uref{http://@/www@/.vim@/.org,VIM}, LilyPond fournit +un fichier @file{vimrc} qui gère la coloration synthaxique. Le +répertoire @code{$VIM} inclus dans les sources contient aussi un +mode pour saisir la musique et lancer LilyPond. + +Le type de fichier LilyPond sera reconnu si votre +@file{~/.vim/filetype.vim} contient + +@example +if exists("did_load_filetypes") + finish +endif +augroup filetypedetect + au! BufNewFile,BufRead *.ly setf lilypond +augroup END +@end example + +N'oubliez pas d'inclure ce chemin en ajoutant à votre @file{~/.vimrc} la +ligne suivante : + +@example +set runtimepath+=/usr/local/share/lilypond/$@{LILYPOND_VERSION@}/vim/ +@end example + +@noindent +où $@{LILYPOND_VERSION@} correspond à votre version de LilyPond. Si +LilyPond n'est pas installé dans @file{/usr/local/}, modifiez ce chemin +en conséquence. @node jEdit @subsection jEdit -@untranslated +Créé en tant que greffon pour l'éditeur de texte +@uref{http://@/www@/.jedit@/.org@/,jEdit}, LilyPondTool est l'outil le +plus riche en fonctionnalités pour éditer des partitions écrites avec +LilyPond. Cela inclue un assistant à la création de document qui prend +en charge les paroles, un visionneur de PDF avec gestion du +pointer-cliquer. Captures d'écran, démonstrations et instructions +d'installation sont disponibles sur le site de +@uref{http://lilypondtool@/.organum@/.hu,LilyPondTool}. @node TexShop @subsection TexShop -@untranslated +L'éditeur +@uref{http://@/www@/.uoregon@/.edu/~koch/texshop/index@/.html,TexShop} +pour MacOS@tie{}X peut prendre en charge LilyPond, lilypond-book et +convert-ly, en lui adjoignant les extensions disponibles +@uref{http://@/www@/.dimi@/.uniud@/.it/vitacolo/freesoftware@/.html,ici}. @node TextMate @subsection TextMate -@untranslated +TextMate dispose d'un greffon pour LilyPond. Vous pouvez l'installer en +lançant : + +@example +mkdir -p /Library/Application\ Support/TextMate/Bundles +cd /Library/Application\ Support/TextMate/Bundles +svn co http://macromates.com/svn/Bundles/trunk/Bundles/Lilypond.tmbundle/ +@end example @node LilyKDE @subsection LilyKDE -@untranslated +@uref{http://lilykde.googlecode.com/,LilyKDE} est un greffon pour +@uref{http://kate-editor.org/,Kate}, l'éditeur de texte de +l'environnement de bureau KDE. Il dispose d'un assistant à la création +de document LilyPond et un visionneur de PDF. +LilyKDE peut s'interfacer avec +@uref{http://www.volny.cz/smilauer/rumor/,Rumor}, afin de pouvoir entrer +la musique à l'aide d'un clavier MIDI. -@node Point and click -@section Point and click +LilyKDE gère l'hyphénation des paroles, et le gestionnaire de fichiers +de KDE permet de lancer LilyPond sur plusierus fichiers simultanément. -@untranslated +@node Point and click +@section Point and click +Le pointer-cliquer (@emph{point and click}) permet de se retrouver +directement dans le fichier source, à la note que l'on pointe dans le +visionneur de PDF. Ceci facilite grandement le repérage des erreurs à +partir du fichier imprimable. + +Lorsque cette fonctionnalité est active, LilyPond ajoute des hyperliens +au fichier PDF. Ces liens sont transmis au navigateur internet qui se +charge d'ouvrir un éditeur de texte à l'enfroit même où le curseur +pointe. + +Afin que cette chaîne de traitement soit pleinement opérationnelle, il +faut configurer votre visionneur de PDF de façon à ce qu'il suive les +liens grâce au script @file{lilypond-invoke-editor} fourni avec +LilyPond. + + +Pour Xpdf, sous UNIX, vous devrez insérer la ligne suivante dans +le fichier @file{xpdfrc} -- soit @file{/etc/xpdfrc}, soit dans votre +répertoire personnel @file{.xpdfrc}. + +@example +urlCommand "lilypond-invoke-editor %s" +@end example + +@file{lilypond-invoke-editor} est un petit programme assistant. Il se +charge d'appeler un éditeur pour les identifants de ressource +(@emph{URI}) de type @code{textedit}, et un navigateur pour les autres. +Il teste en outre la variable d'environnement @code{EDITOR} pour les cas +suivant : + +@table @code +@item emacs + sera alors lancée la commande +@example +emacsclient --no-wait +@var{line}:@var{column} @var{file} +@end example +@item vim + sera alors lancée la commande +@example +gvim --remote +:@var{line}:norm@var{char} @var{file} +@end example + +@item nedit + sera alors lancée la commande +@example +nc -noask +@var{line} @var{file}' +@end example +@end table + +La variable d'environnement @code{LYEDITOR} permet d'anticiper cette +affectation, puisqu'elle contient la commande qui permet de lancer +l'éditeur en tenant compte des valeurs respectives de @code{%(file)}, +@code{%(column)} , et@code{%(line)}. Par exemple, + +@example +emacsclient --no-wait +%(line)s:%(column)s %(file)s +@end example + +@noindent +en variable d'environnement @code{LYEDITOR} revient au lancement d'un +client emacs standard. + + +@cindex ficher de sortie, taille +@cindex taille du ficher de sortie + +L'option pointer-cliquer accroît la taille des fichiers de manière +significative. Afin de réduire la taille des fichiers PDF et PS, il est +toujours possible de désactiver le pointer-cliquer en ajoutant + +@example +\pointAndClickOff +@end example + +@noindent +dans le fichier @file{.ly}. Il peut alors être activé de manière +explicite grâce à + +@example +\pointAndClickOn +@end example + +Le pointer-cliquer peut aussi être désactivé au moment de la compilation +en ligne de commande : + +@example +lilypond -dno-point-and-click fichier.ly +@end example + +@warning{Lorsqu'un fichier LilyPond est destiné à être redistribué, +pensez à désactiver le pointer-cliquer, de telle sorte que les chemins +d'accès et autres informations propres à votre système ne se retrouvent +pas inclus dans le fichier @file{.pdf}.} -@c -- SKELETON FILE -- diff --git a/Documentation/lilypond-ie-fixes.css b/Documentation/lilypond-ie-fixes.css index 9bdc69ac8f..274f7fdc0d 100644 --- a/Documentation/lilypond-ie-fixes.css +++ b/Documentation/lilypond-ie-fixes.css @@ -33,6 +33,11 @@ blockquote { margin: 1em 1%; } +table.cartouche { + width: 85%; + margin: 1em 7.5%; +} + /***********************************************************/ /* TOC SIDEBAR */ /***********************************************************/ @@ -56,11 +61,11 @@ table#navigation { /***********************************************************/ table#navigation, div#tocframe, div#main, -p, .footer, #languages { +p, h1, h2, ul, .footer, #languages { text-align: left; } -div.subheader p { +div.header h1, div.subheader p { text-align: center; } diff --git a/Documentation/lilypond-mccarty.css b/Documentation/lilypond-mccarty.css index c758db6dab..3e3c1d797f 100644 --- a/Documentation/lilypond-mccarty.css +++ b/Documentation/lilypond-mccarty.css @@ -12,8 +12,8 @@ body { height: 100%; font-size: 100%; line-height: 1.125; - color: black; - background-color: white; + color: #000; + background-color: #fff; } /***********************************************************/ @@ -35,10 +35,10 @@ body { background: #b1d281; font-size: 2em; text-align: center; - margin: 0; padding: 0.4em 0.5em; - border: 1px solid #7b925a; - border-width: 0 0 1px 0; + border: solid #7b925a; + border-width: 1px 0; + margin: 0; } .chapter, .appendix, .unnumbered { @@ -63,10 +63,10 @@ body { } .chapheading { - text-indent: -999em; + position: absolute; height: 0; - padding: 0; - margin: 0; + overflow: hidden; + text-indent: -999em; } /***********************************************************/ @@ -74,19 +74,19 @@ body { /***********************************************************/ a:link { - color: #3465a4; + color: #0c51ab; } a:visited { - color: #8f5902; + color: #804f01; } a:active { - color: #73d216; + color: #278800; } a:hover { - color: #ce5c00; + color: #0105ad; } /***********************************************************/ @@ -96,8 +96,8 @@ a:hover { blockquote { width: 96%; padding: 0; - border: 1px solid #708a4b; - border-left: 5px solid #a3ca6d; + border: solid #b1d281; + border-width: 1px 1px 1px 5px; margin: 1em auto; } @@ -130,7 +130,7 @@ blockquote blockquote { } table.cartouche { - background: #f5f5dc; /* beige */ + background: #f5f5dc; width: 85%; border-collapse: collapse; padding: 0 0.5em; @@ -181,9 +181,7 @@ p { } #languages { - background-color: #f5f5dc; /* beige */ padding: 0.5em 1em; - border-top: 1px solid #8fa77f; margin: 0; } @@ -215,11 +213,11 @@ div#tocframe { padding: 0; margin: 0; overflow: auto; - background-color: #f5f5dc; /* beige */ + background: #f5f5dc; z-index: 100; list-style-type: none; font-size: 0.83em; - line-height: 1.4; + line-height: 1.3; } @media screen { @@ -228,24 +226,40 @@ div#tocframe { } } +div#tocframe a:link, div#tocframe a:visited { + color: #454532; + text-decoration: none; +} + +div#tocframe a:hover { + color: #232b16; + text-decoration: underline; +} + div#tocframe p.toc_uplink { font-size: 1em; line-height: 1.125; background: #c9ccc4; - padding: 0.25em 1em; - border-bottom: 1px solid #8a8c87; + padding: 0.25em 1em 0.25em 0.5em; + border-bottom: 1px solid #a0a087; margin: 0; } +div#tocframe p.toc_uplink a:link, +div#tocframe p.toc_uplink a:visited { + color: #1c1c1b; +} + +div#tocframe p.toc_uplink a:hover { + color: #000; +} + div#tocframe h4 { font-size: 1em; line-height: 1.125; font-weight: bold; font-style: italic; - /* background: #c9ccc4; */ - /* padding: 0.25em 1em; */ padding: 0.75em 0.5em 0 0.5em; - /* border-bottom: 1px solid #8a8c87; */ margin: 0; } @@ -300,14 +314,22 @@ li.toc_current ul { width: 100%; background: #c9ccc4; font-size: 0.83em; - line-height: 1.125; border-collapse: collapse; padding: 0; - border: 0; - border-bottom: 1px solid #8a8c87; + border: none; margin: 0; } +.nav_table a:link, .nav_table a:visited { + color: #1c1c1b; + text-decoration: none; +} + +.nav_table a:hover { + color: #000; + text-decoration: underline; +} + .nav_table tr, .nav_table a { padding: 0; margin: 0; @@ -334,7 +356,7 @@ div.header h1 { } div.subheader { - background-color: #ddd; + background: #ddd; padding: 0; margin: 0; text-align: center; @@ -365,13 +387,18 @@ table .title { } .footer { - background: #c6e7b0; + background: #e5f5ce; font-size: 0.8em; - border: 0; padding: 0.2em 0; + border: solid #b1d281; + border-width: 0 0 5px 0; margin: 0; } +.footer a:link { + color: #0308fc; +} + .footer p { padding: 0 1.25em; margin: 0.4em 0; diff --git a/Documentation/po/de.po b/Documentation/po/de.po index 17a92d4a41..cb35178749 100644 --- a/Documentation/po/de.po +++ b/Documentation/po/de.po @@ -1,17 +1,18 @@ +# translation of de.po to German # translation of LilyPond documentation # Copyright (C) 2006 Han-Wen Nienhuys, Jan Nieuwenhuizen # This file is distributed under the same license as the lilypond package. -# Till Rettig , 2007,2008 # # +# Till Rettig , 2007,2008. msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 13:08+0100\n" -"PO-Revision-Date: 2008-12-14 00:17+0200\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" +"PO-Revision-Date: 2008-12-27 17:09+0200\n" "Last-Translator: Till Rettig \n" -"Language-Team: de\n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -3630,6 +3631,8 @@ msgstr "Setup für bestimmte Betriebssysteme" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3638,12 +3641,14 @@ msgid "Setup for MacOS X" msgstr "Einrichtung für MacOS X" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "Benutzung von Python-Skripten unter MacOS 10.3 oder 10.4" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -6645,9 +6650,8 @@ msgstr "Harfe" #. @unnumberedsubsubsec in Documentation/es/user/keyboards.itely #. @node in Documentation/de/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/de/user/keyboards.itely -#, fuzzy msgid "References for harps" -msgstr "Referenz für Tasteninstrumente" +msgstr "Referenzen für Harfe" #. @node in Documentation/user/keyboards.itely #. @unnumberedsubsubsec in Documentation/user/keyboards.itely @@ -6759,7 +6763,7 @@ msgstr "Akkord für Ukulele" #. Documentation/user/fretted-strings.itely:834 (variable) #. Documentation/user/fretted-strings.itely:865 (variable) #. Documentation/user/fretted-strings.itely:889 (variable) -#. Documentation/user/fretted-strings.itely:935 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "meineAkkorde" @@ -6767,11 +6771,11 @@ msgstr "meineAkkorde" msgid "mychordlist" msgstr "meineAkkordliste" -#. Documentation/user/fretted-strings.itely:922 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "Neues Akkordmuster hinzufügen" -#. Documentation/user/fretted-strings.itely:926 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "neue Akkorde basierend auf dem power-chord-Muster hinzufügen" @@ -6943,7 +6947,7 @@ msgstr "Diese Zeilen definieren die Position der Holzblöcke auf dem System" #. Documentation/user/percussion.itely:386 (comment) msgid "if you like, you can change it or you can use special note heads" msgstr "" -"Wenn Sie wollen, können Sie das ändern oder besondere Notenkönpfe benutzen" +"Wenn Sie wollen, können Sie das ändern oder besondere Notenköpfe benutzen" #. Documentation/user/percussion.itely:387 (comment) msgid "for the woodblocks." @@ -7156,20 +7160,20 @@ msgstr "Dudelsack-Defintionen" msgid "Bagpipe example" msgstr "Dudelsack-Beispiele" -#. Documentation/user/chords.itely:663 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "meineAkkorde" -#. Documentation/user/chords.itely:993 (comment) -#. Documentation/user/chords.itely:1014 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "Noten auf dem gleichen System wie die Symbole" -#. Documentation/user/chords.itely:1077 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "Linien stimmen hier, mit dem gleichen Rhythmus wie im Bass" -#. Documentation/user/chords.itely:1089 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Linien stimmen nicht, obwohl der Rhythmus der gleiche ist" @@ -8490,41 +8494,46 @@ msgstr "vertikal hochschieben" msgid "third finger" msgstr "dritter Finger" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "RehearsalMark zentrieren über dem Schlüssel" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "RehearsalMark zentrieren über der Taktart (TimeSignature)" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "RehearsalMark wird über der Tonart (KeySignature) zentriert" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "RehearsalMark zentrieren über der Tonart (KeySignature)" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "RehearsalMark mit der linken Ecke von KeySignature ausrichten" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "RehearsalMark mit der rechten Ecke von KeySignature ausrichten" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "nach rechts um 3,5 Linienabstände verschieben" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "nach links um 2 Linienabstände verschieben" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "XinO" @@ -8972,10 +8981,8 @@ msgstr "Die @code{centered-on-parent}-Prozeduren benutzen" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" -msgstr "Das @code{break-aligned-interface} benutzen" +msgid "Using the @code{break-alignable-interface}" +msgstr "Benutzung des @code{break-aligned-interface}" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely @@ -9609,11 +9616,6 @@ msgstr "Alte Dateien aktualisieren" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "GNU LilyPond -- Die Programmbenutzung" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "MacOS X auf der Kommandozeile" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "Dateien mit @command{convert-ly} aktualisieren" @@ -9889,6 +9891,11 @@ msgstr "Das Notensatzprogramm" msgid "Ignorieren von Melismen" msgstr "Melismen ignorieren" +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" +msgstr "Das @code{break-aligned-interface} benutzen" + #. input/lsr/accordion-discant-symbols.ly:34 (variable) msgid "discant" msgstr "Diskant" @@ -11866,7 +11873,7 @@ msgstr "Zug-Linie schnell schreiben:" msgid "" "1. write repeatedly 'c c c c c c c c |' for the whole length of the song " msgstr "" -"1. wiederholgt 'c·c·c·c·c·c·c·c·|' über die gesamte Länge des Stückes " +"1. wiederholt 'c·c·c·c·c·c·c·c·|' über die gesamte Länge des Stückes " "schreiben" #. input/lsr/score-for-diatonic-accordion.ly:90 (comment) @@ -12220,8 +12227,8 @@ msgid "" "\\include \\\"piece.ly\\\" %%% uncomment this line when using a " "separate file" msgstr "" -"\\include·\\\"piece.ly\\\"·············%%%·Zeile einkommentierten, wenn eine " -"extraDatei benutzt wird" +"\\include \\\"piece.ly\\\" %%% Zeile einkommentieren, wenn eine " +"extra Datei benutzt wird" #. input/lsr/string-quartet-template-with-separate-parts.ly:122 (comment) msgid "{ Uncomment this block when using separate files" @@ -12576,6 +12583,9 @@ msgstr "Fußnoten" msgid "Table of Contents" msgstr "Inhaltsverzeichnis" +#~ msgid "MacOS X on the command-line" +#~ msgstr "MacOS X auf der Kommandozeile" + #~ msgid "Harp notation" #~ msgstr "Harfennotation" diff --git a/Documentation/po/es.po b/Documentation/po/es.po index de2e137ba4..2926432272 100644 --- a/Documentation/po/es.po +++ b/Documentation/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 17:44+0100\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" "PO-Revision-Date: 2008-12-20 17:45+0100\n" "Last-Translator: Francisco Vila \n" "Language-Team: Español\n" @@ -2399,7 +2399,8 @@ msgstr "Aumentar solamente el grosor de la ligadura siguiente" #. Documentation/user/tweaks.itely:736 (comment) msgid "Revert thickness of all following slurs to default of 1.2" -msgstr "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" +msgstr "" +"Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" #. Documentation/user/tweaks.itely:1396 (comment) msgid "Don't print clefs in this staff" @@ -2415,7 +2416,8 @@ msgstr "Reducir el tamaño de la fuente en un 24% aprox." #. Documentation/user/tweaks.itely:1528 (comment) msgid "Reduce stem length and line spacing to match" -msgstr "Reducir la longitud de la plica y el espaciado de la línea en coincidencia" +msgstr "" +"Reducir la longitud de la plica y el espaciado de la línea en coincidencia" #. Documentation/user/tweaks.itely:1958 (comment) #. Documentation/user/tweaks.itely:2028 (comment) @@ -2457,7 +2459,8 @@ msgstr "Detener el corchete de octava" #. Documentation/user/tweaks.itely:2033 (comment) msgid "Place following Ottava Bracket below Text Spanners" -msgstr "Situar el corchete de octava ulterior por debajo de los extensores de texto" +msgstr "" +"Situar el corchete de octava ulterior por debajo de los extensores de texto" #. Documentation/user/tweaks.itely:2095 (comment) msgid "Cause notes to space out to accommodate text" @@ -2923,7 +2926,8 @@ msgstr "la propiedad padding (relleno)" #. @subheading in Documentation/es/user/tweaks.itely #. @subheading in Documentation/de/user/tweaks.itely msgid "left-padding and right-padding" -msgstr "left-padding y right-padding (relleno por la izquierda y por la derecha)" +msgstr "" +"left-padding y right-padding (relleno por la izquierda y por la derecha)" #. @subheading in Documentation/user/tweaks.itely #. @subheading in Documentation/fr/user/tweaks.itely @@ -3635,6 +3639,8 @@ msgstr "Ajustes para sistemas operativos específicos" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3643,12 +3649,14 @@ msgid "Setup for MacOS X" msgstr "Configuración para MacOS X" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "Uso de guiones Python en MacOS 10.3 o 10.4" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -4591,7 +4599,8 @@ msgstr "misDuraciones" #. Documentation/user/rhythms.itely:1598 (comment) msgid "end 1/16 beams for all time signatures at the 1/16 moment" -msgstr "finalizar barras de semicorchea para todos los compases en el momento 1/16" +msgstr "" +"finalizar barras de semicorchea para todos los compases en el momento 1/16" #. Documentation/user/rhythms.itely:1602 (comment) msgid "end 1/32 beams for all time signatures at the 1/16 moment" @@ -4645,7 +4654,8 @@ msgstr "Imprimir el número de compás cada dos compases" #. Documentation/user/rhythms.itely:2070 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" -msgstr "No poner números de compás al final de la línea, pero sí en otros lugares" +msgstr "" +"No poner números de compás al final de la línea, pero sí en otros lugares" #. Documentation/user/rhythms.itely:2074 (comment) #. Documentation/user/rhythms.itely:2100 (comment) @@ -5761,7 +5771,8 @@ msgstr "Formateo de las notas de aviso" #. Documentation/user/editorial.itely:326 (comment) msgid "this is deliberate nonsense; note that the stems remain black" -msgstr "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" +msgstr "" +"esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" #. @node in Documentation/user/editorial.itely #. @section in Documentation/user/editorial.itely @@ -6776,7 +6787,7 @@ msgstr "Un acorde de ukelele" #. Documentation/user/fretted-strings.itely:834 (variable) #. Documentation/user/fretted-strings.itely:865 (variable) #. Documentation/user/fretted-strings.itely:889 (variable) -#. Documentation/user/fretted-strings.itely:935 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "misAcordes" @@ -6784,11 +6795,11 @@ msgstr "misAcordes" msgid "mychordlist" msgstr "miListaDeAcordes" -#. Documentation/user/fretted-strings.itely:922 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "añadir una forma de acorde nueva" -#. Documentation/user/fretted-strings.itely:926 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "añadir acordes nuevos basados en la forma de acorde principal" @@ -6979,7 +6990,8 @@ msgstr "También define las posiciones de las dos líneas." #. Documentation/user/percussion.itely:396 (comment) msgid "This is neccessary; if not entered, the barline would be too short!" -msgstr "Esto es necesario; si no se pone, la línea divisoria sería demasiado corta." +msgstr "" +"Esto es necesario; si no se pone, la línea divisoria sería demasiado corta." #. Documentation/user/percussion.itely:403 (comment) msgid "with this you load your new drum style table" @@ -7172,20 +7184,20 @@ msgstr "Definiciones para la gaita" msgid "Bagpipe example" msgstr "Ejemplo de música de gaita" -#. Documentation/user/chords.itely:663 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "misAcordes" -#. Documentation/user/chords.itely:993 (comment) -#. Documentation/user/chords.itely:1014 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "Poner las notas en el mismo pentagrama que los números" -#. Documentation/user/chords.itely:1077 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "Los extensores aquí son correctos, con el mismo ritmo que el bajo" -#. Documentation/user/chords.itely:1089 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Los extensores aquí son incorrectos, aunque la medida es la misma" @@ -7513,7 +7525,7 @@ msgstr "Ligaduras mensurales blancas" #. @node in Documentation/es/user/ancient.itely #. @subsection in Documentation/es/user/ancient.itely msgid "Typesetting Gregorian chant" -msgstr "Tipografiado del canto Gregoriano" +msgstr "Tipografiado del canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely @@ -7524,21 +7536,21 @@ msgstr "Tipografiado del canto Gregoriano" #. @node in Documentation/de/user/ancient.itely #. @unnumberedsubsubsec in Documentation/de/user/ancient.itely msgid "Gregorian chant contexts" -msgstr "Contextos del Canto Gregoriano" +msgstr "Contextos del canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @unnumberedsubsubsec in Documentation/es/user/ancient.itely msgid "Gregorian clefs" -msgstr "Claves de canto Gregoriano" +msgstr "Claves de canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @unnumberedsubsubsec in Documentation/es/user/ancient.itely msgid "Gregorian accidentals and key signatures" -msgstr "Alteraciones y armaduras de canto Gregoriano" +msgstr "Alteraciones y armaduras de canto gregoriano" # ? FVD #. @node in Documentation/user/ancient.itely @@ -7557,7 +7569,7 @@ msgstr "Divisiones" #. @node in Documentation/es/user/ancient.itely #. @unnumberedsubsubsec in Documentation/es/user/ancient.itely msgid "Gregorian articulation signs" -msgstr "Articulaciones del canto Gregoriano" +msgstr "Articulaciones del canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely @@ -7611,7 +7623,7 @@ msgstr "Disposición tipo «Mensurstriche»" #. @node in Documentation/de/user/ancient.itely #. @unnumberedsubsubsec in Documentation/de/user/ancient.itely msgid "Transcribing Gregorian chant" -msgstr "Transcripción de Canto Gregoriano" +msgstr "Transcripción de canto gregoriano" #. @node in Documentation/user/ancient.itely #. @unnumberedsubsubsec in Documentation/user/ancient.itely @@ -8091,7 +8103,8 @@ msgstr "esta vez el texto estará más cerca del pentagrama" #. Documentation/user/spacing.itely:1759 (comment) msgid "by setting outside-staff-priority to a non-number," -msgstr "ajustando el valor de outside-staff-priority a algo que no sea un número," +msgstr "" +"ajustando el valor de outside-staff-priority a algo que no sea un número," #. Documentation/user/spacing.itely:1760 (comment) msgid "we disable the automatic collision avoidance" @@ -8532,11 +8545,13 @@ msgstr "la RehearsalMark se centra sobre la armadura" #. Documentation/user/changing-defaults.itely:3001 (comment) #. Documentation/user/changing-defaults.itely:3017 (comment) #. Documentation/user/changing-defaults.itely:3024 (comment) -msgid "The RehearsalMark will be aligned with the left edge of the KeySignature" +msgid "" +"The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "la RehearsalMark se alinea por la izquierda con la armadura" #. Documentation/user/changing-defaults.itely:3006 (comment) -msgid "The RehearsalMark will be aligned with the right edge of the KeySignature" +msgid "" +"The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "la RehearsalMark se alinea por la derecha con la armadura" #. Documentation/user/changing-defaults.itely:3018 (comment) @@ -9635,11 +9650,6 @@ msgstr "Actualizar archivos antiguos" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "MacOS X sobre línea de órdenes" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "Actualizar ficheros con @command{convert-ly}" @@ -10080,11 +10090,13 @@ msgstr "la RehearsalMark se centra sobre la armadura" #. input/lsr/aligning-marks-with-various-notation-objects.ly:65 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:77 (comment) -msgid "the RehearsalMark will be aligned with the left edge of the KeySignature" +msgid "" +"the RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "la RehearsalMark se alinea por la izquierda con la armadura" #. input/lsr/aligning-marks-with-various-notation-objects.ly:71 (comment) -msgid "the RehearsalMark will be aligned with the right edge of the KeySignature" +msgid "" +"the RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "la RehearsalMark se alinea por la derecha con la armadura" #. input/lsr/aligning-marks-with-various-notation-objects.ly:78 (comment) @@ -10210,7 +10222,8 @@ msgstr "ARREGLAR: esablecer de nuevo printKeyCancellation a #t no debe" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:77 (comment) msgid "occur in the first bar after the incipit. Dto. for forceClef." -msgstr "ocurrir en el primer compás después del incipit. Lo mismo para forceClef." +msgstr "" +"ocurrir en el primer compás después del incipit. Lo mismo para forceClef." #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:78 (comment) msgid "Therefore, we need an extra \\skip." @@ -10362,7 +10375,8 @@ msgstr "sin ligaduras de expresión" #. input/lsr/incipit.ly:274 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:280 (comment) msgid "Comment in the below \\\"\\remove\\\" command to allow line" -msgstr "Quite el comentario de la instrucción \\\"\\remove\\\" de abajo para permitir" +msgstr "" +"Quite el comentario de la instrucción \\\"\\remove\\\" de abajo para permitir" #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:264 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:281 (comment) @@ -10380,7 +10394,8 @@ msgstr "" #. input/lsr/incipit.ly:277 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:283 (comment) msgid "short example score, but especially for large scores, you" -msgstr "partitura corta de ejemplo, pero especialmente para partituras extensas," +msgstr "" +"partitura corta de ejemplo, pero especialmente para partituras extensas," #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:267 (comment) #. input/lsr/incipit.ly:278 (comment) @@ -10392,7 +10407,8 @@ msgstr "probablemente consiga unos saltos de línea mejores y así mejorar" #. input/lsr/incipit.ly:279 (comment) #. input/lsr/transcription-of-ancient-music-with-incipit.ly:285 (comment) msgid "overall spacing if you comment in the following command." -msgstr "el espaciado general si elimina el comentario de la instrucción siguiente." +msgstr "" +"el espaciado general si elimina el comentario de la instrucción siguiente." #. input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly:269 (comment) #. input/lsr/incipit.ly:280 (comment) @@ -10477,7 +10493,8 @@ msgstr "Campo de cabecera Copyright sólo en la primera página del libro" #. input/lsr/book-parts.ly:32 (comment) msgid "Part tagline header field only on each part last page." -msgstr "Cebecera de lína de pie de la parte sólo en la última página de cada parte" +msgstr "" +"Cebecera de lína de pie de la parte sólo en la última página de cada parte" #. input/lsr/book-parts.ly:36 (comment) msgid "Tagline header field only on book last page." @@ -10511,7 +10528,8 @@ msgstr "" #. input/lsr/breathing-signs.ly:26 (comment) msgid "rvarcomma and lvarcomma are variations of the default rcomma and lcomma" -msgstr "rvarcomma y lvarcomma son variantes de las rcomma y lcomma predeterminadas" +msgstr "" +"rvarcomma y lvarcomma son variantes de las rcomma y lcomma predeterminadas" #. input/lsr/breathing-signs.ly:27 (comment) msgid "N.B.: must use Staff context here, since we start a Voice below" @@ -10611,7 +10629,8 @@ msgstr "cambiaMusicaExcepciones" #. input/lsr/chord-name-exceptions.ly:31 (comment) msgid "Convert music to list and prepend to existing exceptions." -msgstr "Convertir la música en una lista y añadirla a las excepciones existentes." +msgstr "" +"Convertir la música en una lista y añadirla a las excepciones existentes." #. input/lsr/chord-name-exceptions.ly:32 (variable) msgid "chExceptions" @@ -10639,7 +10658,8 @@ msgstr "(make-rhythmic-locations NUM-COMPAS NUMERADOR DENOMINADOR)" #. input/lsr/clip-systems.ly:59 (comment) msgid "means NUM/DEN whole-notes into bar numbered BAR-NUMBER" -msgstr "significa NUMERADOR/DENOMINADOR redondas en el compás número NUM-COMPAS" +msgstr "" +"significa NUMERADOR/DENOMINADOR redondas en el compás número NUM-COMPAS" #. input/lsr/coloring-notes-depending-on-their-pitch.ly:13 (comment) msgid "Association list of pitches to colors." @@ -10790,7 +10810,8 @@ msgstr "solMayor" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:69 (comment) msgid "end of potential include file /predefined-cuatro-fretboards.ly" -msgstr "fin del potencial archivo de inclusión /posiciones-predefinidas-del-cuatro.ly" +msgstr "" +"fin del potencial archivo de inclusión /posiciones-predefinidas-del-cuatro.ly" #. input/lsr/defining-predefined-fretboards-for-other-instruments.ly:74 (variable) msgid "primerosNames" @@ -11045,7 +11066,8 @@ msgstr "" #. input/lsr/fret-diagrams-explained-and-developed.ly:37 (comment) msgid "A chord for ukelele, with formatting defined in definition string" -msgstr "Acorde para el ukelele, con el formato definido en la cadena de definición" +msgstr "" +"Acorde para el ukelele, con el formato definido en la cadena de definición" #. input/lsr/fret-diagrams-explained-and-developed.ly:38 (comment) msgid "1.2 * size, 4 strings, 4 frets, fingerings below string" @@ -11150,7 +11172,8 @@ msgstr "" "alignment lo ponga en la posición correcta" #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:63 (comment) -msgid "Drawback: the padding really reserves the space, nothing else can be there" +msgid "" +"Drawback: the padding really reserves the space, nothing else can be there" msgstr "" "Inconveniente: el relleno reserva el espacio realmente, no puede haber nada " "más aquí" @@ -11174,7 +11197,8 @@ msgstr "" "podría dar lugar a colisiones" #. input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly:74 (comment) -msgid "Drawback: Also, there seems to be some spacing, so it's not exactly the " +msgid "" +"Drawback: Also, there seems to be some spacing, so it's not exactly the " msgstr "" "Inconveniente: asimismo, parece haber algo de espacio, por lo que no es " "exactamente" @@ -11621,11 +11645,13 @@ msgstr "el truco siguiente mueve el silencio a la línea central" #. input/lsr/positioning-multi--measure-rests.ly:50 (comment) msgid "Multi-measure rests in odd-numbered voices are under the top line" -msgstr "Los silencios multicompás de las voces impares están bajo la línea superior" +msgstr "" +"Los silencios multicompás de las voces impares están bajo la línea superior" #. input/lsr/positioning-multi--measure-rests.ly:52 (comment) msgid "Multi-measure rests in even-numbered voices are under the bottom line" -msgstr "Los silencios multicompás de las voces pares están bajo la línea inferior" +msgstr "" +"Los silencios multicompás de las voces pares están bajo la línea inferior" #. input/lsr/positioning-multi--measure-rests.ly:54 (comment) msgid "They remain separated even in empty measures" @@ -11647,7 +11673,8 @@ msgstr "" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:35 (comment) msgid "Set coda sign as rehearsal mark and adjust size if needed" -msgstr "Fijar llamada de coda como letra de ensayo y ajustar tamaño si es necesario" +msgstr "" +"Fijar llamada de coda como letra de ensayo y ajustar tamaño si es necesario" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:42 (comment) msgid "Should Coda be on anew line?" @@ -11673,7 +11700,8 @@ msgstr "¡Aquí comienzan los trucos!" msgid "" "\\cadenzaOn will suppress the bar count and \\stopStaff removes the staff " "lines." -msgstr "\\cadenzaOn suprime la cuenta de compases y \\stopStaff quita el pentagrama" +msgstr "" +"\\cadenzaOn suprime la cuenta de compases y \\stopStaff quita el pentagrama" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:58 (comment) msgid "Some examples of possible text-displays " @@ -11763,7 +11791,8 @@ msgstr "¡Mostraos, clave y armadura!" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:99 (comment) msgid "Set coda sign as rehearsal mark and adjust size and position" -msgstr "Fijar el signo de coda como letra de enzayo y ajustar el tamaño y posición" +msgstr "" +"Fijar el signo de coda como letra de enzayo y ajustar el tamaño y posición" #. input/lsr/positioning-segno-and-coda-with-line-break.ly:101 (comment) msgid "" @@ -11833,7 +11862,8 @@ msgstr "" #. input/lsr/removing-the-first-empty-line.ly:53 (comment) msgid "To use the setting globally, comment this line," -msgstr "Para usar el ajuste globalmente, haga un comentario de la línea siguiente:" +msgstr "" +"Para usar el ajuste globalmente, haga un comentario de la línea siguiente:" #. input/lsr/removing-the-first-empty-line.ly:54 (comment) msgid "uncomment the line in the \\layout block above" @@ -11892,7 +11922,8 @@ msgstr "" "se simula con una línea de rejilla" #. input/lsr/score-for-diatonic-accordion.ly:83 (comment) -msgid "disable the following line to see the the noteheads while writing the song " +msgid "" +"disable the following line to see the the noteheads while writing the song " msgstr "" "Deshabilite la línea siguiente para ver las cabezas mientras escribe la " "canción" @@ -11906,7 +11937,8 @@ msgid "How to fast write the push-lines: " msgstr "Cuán rápido escribir las líneas de cerrar:" #. input/lsr/score-for-diatonic-accordion.ly:89 (comment) -msgid "1. write repeatedly 'c c c c c c c c |' for the whole length of the song " +msgid "" +"1. write repeatedly 'c c c c c c c c |' for the whole length of the song " msgstr "1. escribir repetidamente 'c c c c c c c c |' en toda la canción" #. input/lsr/score-for-diatonic-accordion.ly:90 (comment) @@ -11922,7 +11954,8 @@ msgid "4. Mark the positions on which push/pull changes. " msgstr "4. Marcar las posiciones en las que cambia el abrir o cerrar" #. input/lsr/score-for-diatonic-accordion.ly:93 (comment) -msgid "In the score-picture click on the position the push- or pull-part starts " +msgid "" +"In the score-picture click on the position the push- or pull-part starts " msgstr "" "En la imagen de la partitura pulse sobre la posición en que inician las " "partes de abrir o cerrar" @@ -11941,7 +11974,8 @@ msgstr "a) Si en ese lugar empieza una parte de cerrar, cambie la 'c' por 'e['" #. input/lsr/score-for-diatonic-accordion.ly:97 (comment) msgid "b) If a pull-part starts there, replace the 'c' by an 's'" -msgstr "b) Si en ese lugar empieza una parte de abrir, cambie la 'c' por una 's'" +msgstr "" +"b) Si en ese lugar empieza una parte de abrir, cambie la 'c' por una 's'" #. input/lsr/score-for-diatonic-accordion.ly:98 (comment) msgid "5. Switch into 'overwrite-mode' by pressing the 'ins' key. " @@ -12100,7 +12134,8 @@ msgid "staffBassRhytm" msgstr "duracionesPentagramaBajo" #. input/lsr/score-for-diatonic-accordion.ly:200 (comment) -msgid "This is not a RhythmicStaff because it must be possible to append lyrics." +msgid "" +"This is not a RhythmicStaff because it must be possible to append lyrics." msgstr "Esto no es un RhythmicStaff porque se debe poder aplicar letra." #. input/lsr/score-for-diatonic-accordion.ly:202 (comment) @@ -12266,7 +12301,8 @@ msgstr "" #. input/lsr/string-quartet-template-with-separate-parts.ly:122 (comment) msgid "{ Uncomment this block when using separate files" -msgstr "{ Quite la marca de comentario de este bloque si está usando archivos aparte" +msgstr "" +"{ Quite la marca de comentario de este bloque si está usando archivos aparte" #. input/lsr/string-quartet-template-with-separate-parts.ly:124 (comment) msgid "vn1.ly" @@ -12357,7 +12393,8 @@ msgid "incipitBassus" msgstr "" #. input/lsr/transcription-of-ancient-music-with-incipit.ly:226 (comment) -msgid "StaffGroup is used instead of ChoirStaff to get bar lines between systems" +msgid "" +"StaffGroup is used instead of ChoirStaff to get bar lines between systems" msgstr "" "StaffGroup se usa en lugar de ChoirStaff para tener líneas divisorias entre " "los sistemas" @@ -12422,7 +12459,8 @@ msgstr "Cambiar el símbolo de compás, manteniendo el barrado subyacente de 3/4 #. input/lsr/using-beatlength-and-beatgrouping.ly:47 (comment) msgid "The 3/4 time default grouping of (1 1 1) and beatLength of 1/8" -msgstr "El agrupamiento predeterminado de (1 1 1) y beatLength de 1/8 del compás 3/4" +msgstr "" +"El agrupamiento predeterminado de (1 1 1) y beatLength de 1/8 del compás 3/4" #. input/lsr/using-beatlength-and-beatgrouping.ly:48 (comment) msgid "are not consistent with a measureLength of 3/4, so the beams" @@ -12624,3 +12662,5 @@ msgstr "Notas al pie" msgid "Table of Contents" msgstr "Índice general" +#~ msgid "MacOS X on the command-line" +#~ msgstr "MacOS X sobre línea de órdenes" diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po index 948f9d59d8..311f32d031 100644 --- a/Documentation/po/fr.po +++ b/Documentation/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 13:08+0100\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" "PO-Revision-Date: 2008-11-09 13:14+0100\n" "Last-Translator: Jean-Charles Malahieude \n" "Language-Team: Français \n" @@ -3639,6 +3639,8 @@ msgstr "Spécificités pour certains systèmes" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3647,12 +3649,14 @@ msgid "Setup for MacOS X" msgstr "Spécificités pour MacOS X" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "Utilisation de scripts Python sur MacOS 10.3 ou 10.4" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -6781,7 +6785,7 @@ msgstr "Un accord pour ukulele" #. Documentation/user/fretted-strings.itely:834 (variable) #. Documentation/user/fretted-strings.itely:865 (variable) #. Documentation/user/fretted-strings.itely:889 (variable) -#. Documentation/user/fretted-strings.itely:935 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "mesaccords" @@ -6789,11 +6793,11 @@ msgstr "mesaccords" msgid "mychordlist" msgstr "malistedaccords" -#. Documentation/user/fretted-strings.itely:922 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "ajout d'un nouveau canevas d'accord" -#. Documentation/user/fretted-strings.itely:926 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "ajout de nouveaux accords basés sur le nouveau canevas" @@ -7180,21 +7184,21 @@ msgstr "Définitions pour la cornemuse" msgid "Bagpipe example" msgstr "Exemple pour la cornemuse" -#. Documentation/user/chords.itely:663 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "mesAccords" -#. Documentation/user/chords.itely:993 (comment) -#. Documentation/user/chords.itely:1014 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "Assemblage des notes et de la basse chiffrée sur une même portée" -#. Documentation/user/chords.itely:1077 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "" "Les prolongateurs sont corrects, ils suivent bien le rythme de la basse" -#. Documentation/user/chords.itely:1089 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Les prolongateurs sont erronés, bien que le rythme soit le même" @@ -8518,41 +8522,47 @@ msgstr "déplacement vers le haut" msgid "third finger" msgstr "troisième doigt" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "Pour centrer le repère au-dessus de la clef" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "Pour centrer le repère au-dessus de la métrique" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +#, fuzzy +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "Pour centrer le repère au-dessus de l'armure" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "Pour centrer le repère au-dessus de l'armure" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "Pour aligner le repère sur le coin gauche de l'armure" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "Pour aligner le repère sur le coin droit de l'armure" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "puis décaler vers la droite de 3,5 espaces" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "puis décaler vers la gauche de 2 espaces" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "XdansO" @@ -9000,9 +9010,8 @@ msgstr "Utilisation des procédures @code{centered-on-parent}" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" +#, fuzzy +msgid "Using the @code{break-alignable-interface}" msgstr "Utilisation de @code{break-aligned-interface}" #. @node in Documentation/user/changing-defaults.itely @@ -9639,11 +9648,6 @@ msgstr "Mise à jour d'anciens fichiers" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "GNU LilyPond --- Utilisation du programme" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "MacOS X et la ligne de commande" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "Mise à jour avec @command{convert-ly}" @@ -9921,6 +9925,11 @@ msgstr "" msgid "Ignorieren von Melismen" msgstr "Désactivation du traitement des mélismes" +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" +msgstr "Utilisation de @code{break-aligned-interface}" + #. input/lsr/accordion-discant-symbols.ly:34 (variable) #, fuzzy msgid "discant" @@ -12749,6 +12758,9 @@ msgstr "Notes de bas de page" msgid "Table of Contents" msgstr "Table des matières" +#~ msgid "MacOS X on the command-line" +#~ msgstr "MacOS X et la ligne de commande" + #, fuzzy #~ msgid "Harp notation" #~ msgstr "Notation sur la portée" diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot index 8e2aa1db74..c55d3eb8a4 100644 --- a/Documentation/po/lilypond-doc.pot +++ b/Documentation/po/lilypond-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 13:08+0100\n" +"POT-Creation-Date: 2008-12-25 12:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3618,6 +3618,8 @@ msgstr "" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely #. @node in Documentation/es/user/setup.itely #. @subsection in Documentation/es/user/setup.itely #. @node in Documentation/de/user/setup.itely @@ -3626,12 +3628,14 @@ msgid "Setup for MacOS X" msgstr "" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "Using Python scripts on MacOS 10.3 or 10.4" msgstr "" #. @subsubheading in Documentation/user/setup.itely +#. @subsubheading in Documentation/fr/user/setup.itely #. @subsubheading in Documentation/es/user/setup.itely #. @subsubheading in Documentation/de/user/setup.itely msgid "MacOS X on the command line" @@ -6745,7 +6749,7 @@ msgstr "" #. Documentation/user/fretted-strings.itely:834 (variable) #. Documentation/user/fretted-strings.itely:865 (variable) #. Documentation/user/fretted-strings.itely:889 (variable) -#. Documentation/user/fretted-strings.itely:935 (variable) +#. Documentation/user/fretted-strings.itely:937 (variable) msgid "mychords" msgstr "" @@ -6753,11 +6757,11 @@ msgstr "" msgid "mychordlist" msgstr "" -#. Documentation/user/fretted-strings.itely:922 (comment) +#. Documentation/user/fretted-strings.itely:924 (comment) msgid "add a new chord shape" msgstr "" -#. Documentation/user/fretted-strings.itely:926 (comment) +#. Documentation/user/fretted-strings.itely:928 (comment) msgid "add some new chords based on the power chord shape" msgstr "" @@ -7141,20 +7145,20 @@ msgstr "" msgid "Bagpipe example" msgstr "" -#. Documentation/user/chords.itely:663 (variable) +#. Documentation/user/chords.itely:669 (variable) msgid "myChords" msgstr "" -#. Documentation/user/chords.itely:993 (comment) -#. Documentation/user/chords.itely:1014 (comment) +#. Documentation/user/chords.itely:999 (comment) +#. Documentation/user/chords.itely:1020 (comment) msgid "Put notes on same Staff as figures" msgstr "" -#. Documentation/user/chords.itely:1077 (comment) +#. Documentation/user/chords.itely:1083 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "" -#. Documentation/user/chords.itely:1089 (comment) +#. Documentation/user/chords.itely:1095 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "" @@ -8475,41 +8479,46 @@ msgstr "" msgid "third finger" msgstr "" -#. Documentation/user/changing-defaults.itely:2945 (comment) +#. Documentation/user/changing-defaults.itely:2948 (comment) +#. Documentation/user/changing-defaults.itely:2980 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:39 (comment) msgid "the RehearsalMark will be centered above the Clef" msgstr "" -#. Documentation/user/changing-defaults.itely:2951 (comment) +#. Documentation/user/changing-defaults.itely:2954 (comment) #. input/lsr/aligning-marks-with-various-notation-objects.ly:46 (comment) msgid "the RehearsalMark will be centered above the TimeSignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2965 (comment) +#. Documentation/user/changing-defaults.itely:2974 (comment) +msgid "the RehearsalMark will be centered above the Key Signature" +msgstr "" + +#. Documentation/user/changing-defaults.itely:2994 (comment) msgid "The RehearsalMark will be centered above the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2972 (comment) -#. Documentation/user/changing-defaults.itely:2988 (comment) -#. Documentation/user/changing-defaults.itely:2995 (comment) +#. Documentation/user/changing-defaults.itely:3001 (comment) +#. Documentation/user/changing-defaults.itely:3017 (comment) +#. Documentation/user/changing-defaults.itely:3024 (comment) msgid "" "The RehearsalMark will be aligned with the left edge of the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2977 (comment) +#. Documentation/user/changing-defaults.itely:3006 (comment) msgid "" "The RehearsalMark will be aligned with the right edge of the KeySignature" msgstr "" -#. Documentation/user/changing-defaults.itely:2989 (comment) +#. Documentation/user/changing-defaults.itely:3018 (comment) msgid "and then shifted right by 3.5 staff-spaces" msgstr "" -#. Documentation/user/changing-defaults.itely:2996 (comment) +#. Documentation/user/changing-defaults.itely:3025 (comment) msgid "and then shifted left by 2 staff-spaces" msgstr "" -#. Documentation/user/changing-defaults.itely:3045 (variable) +#. Documentation/user/changing-defaults.itely:3073 (variable) msgid "XinO" msgstr "" @@ -8957,9 +8966,7 @@ msgstr "" #. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @unnumberedsubsubsec in Documentation/es/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely -msgid "Using the @code{break-aligned-interface}" +msgid "Using the @code{break-alignable-interface}" msgstr "" #. @node in Documentation/user/changing-defaults.itely @@ -9594,11 +9601,6 @@ msgstr "" msgid "GNU LilyPond --- Utilisation des programmes" msgstr "" -#. @node in Documentation/fr/user/setup.itely -#. @subsection in Documentation/fr/user/setup.itely -msgid "MacOS X on the command-line" -msgstr "" - #. @section in Documentation/fr/user/running.itely msgid "Updating with @command{convert-ly}" msgstr "" @@ -9874,6 +9876,11 @@ msgstr "" msgid "Ignorieren von Melismen" msgstr "" +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using the @code{break-aligned-interface}" +msgstr "" + #. input/lsr/accordion-discant-symbols.ly:34 (variable) msgid "discant" msgstr "" diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index f18656a179..ae2e4f409b 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -62,6 +62,14 @@ which scares away people. @end ignore +@item +Unbeamed 128th notes are now supported: +@lilypond +\relative c'' { + g128 +} +@end lilypond + @item Straight flags (used in old scores of e.g. Bach, but also in different form in modern scores of e.g. Stockhausen) are now implemented: diff --git a/Documentation/translations.html.in b/Documentation/translations.html.in index 19e8b984f6..9be5c023c3 100644 --- a/Documentation/translations.html.in +++ b/Documentation/translations.html.in @@ -38,7 +38,7 @@ translations.template.html.in; DO NOT EDIT !--> is finished.

-

Last updated Sun Dec 21 09:36:02 UTC 2008 +

Last updated Sun Dec 28 01:18:10 UTC 2008

@@ -242,7 +242,9 @@ translations.template.html.in; DO NOT EDIT !--> - - + - + - + - @@ -716,7 +721,7 @@ translations.template.html.in; DO NOT EDIT !-->
2 Setup
(1149)
not translated
+
Jean-Charles Malahieude
+ translated
+
Till Rettig
Reinhold Kainhofer
@@ -286,7 +288,7 @@ translations.template.html.in; DO NOT EDIT !-->
5 Converting from other formats
(1171)
Jean-Charles Malahieude
translated
- partially up to date
+
Reinhold Kainhofer
Till Rettig
@@ -435,7 +437,7 @@ translations.template.html.in; DO NOT EDIT !-->
Till Rettig
translated
- partially up to date
+ up to date
Francisco Vila
translated
@@ -541,7 +543,7 @@ translations.template.html.in; DO NOT EDIT !-->
2.4 Fretted string instruments
(1830)
2.4 Fretted string instruments
(1850)
Valentin Villenave
Jean-Charles Malahieude
John Mandereau

@@ -567,7 +569,7 @@ translations.template.html.in; DO NOT EDIT !-->
Till Rettig
translated
- partially up to date
+ up to date
Francisco Vila
translated
@@ -592,7 +594,7 @@ translations.template.html.in; DO NOT EDIT !-->
2.7 Chord notation
(1398)
2.7 Chord notation
(1464)
Valentin Villenave
Jean-Charles Malahieude
John Mandereau

@@ -609,7 +611,7 @@ translations.template.html.in; DO NOT EDIT !-->
2.8 Ancient notation
(4486)
2.8 Ancient notation
(4487)
John Mandereau
Jean-Charles Malahieude
partially translated (79 %)
@@ -645,7 +647,7 @@ translations.template.html.in; DO NOT EDIT !--> partially up to date
Till Rettig
- partially translated (5 %)
+ translated
up to date
Francisco Vila
@@ -673,7 +675,7 @@ translations.template.html.in; DO NOT EDIT !-->
5 Changing defaults
(11391)
Valentin Villenave
Gilles Thibault
- partially translated (33 %)
+ partially translated (42 %)
partially up to date
not translated
@@ -685,7 +687,10 @@ translations.template.html.in; DO NOT EDIT !-->
6 Interfaces for programmers
(5202)
not translated
+
Valentin Villenave
+ Gilles Thibault
+ partially translated (9 %)
+ partially up to date
not translated
Till Rettig
translated
- partially up to date
+ up to date
Francisco Vila
translated
diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely index 56960581c9..6774268c76 100644 --- a/Documentation/user/ancient.itely +++ b/Documentation/user/ancient.itely @@ -728,7 +728,7 @@ There are no 32th and 64th rests specifically for the mensural or neo-mensural style. Instead, the rests from the default style will be taken. -See @rlsr{Pitches,rests} for a chart of all rests. +See @rlsr{Ancient notation} for a chart of all rests. @seealso Notation Reference: @ref{Rests}, gives a general introduction into the use of diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely index 9c44ec9869..11b45b6689 100644 --- a/Documentation/user/chords.itely +++ b/Documentation/user/chords.itely @@ -139,7 +139,10 @@ Seventh chords can be created: @funindex m The table belows shows the actions of the quality modifiers on -triads and seventh chords. A more complete table of modifier usage +triads and seventh chords. The default seventh step added to +chords is a minor or flatted seventh, which makes the dominant +seventh the basic seventh chord. All alterations are relative to +the dominant seventh. A more complete table of modifier usage is found at @ref{Common chord modifiers}. @c @table @code @@ -167,8 +170,7 @@ The default action; produces a major triad. @item m, m7 @tab -The minor chord. This modifier lowers the 3rd and (if present) the -7th step. +The minor chord. This modifier lowers the 3rd. @tab @lilypond[line-width=4\cm, noragged-right] \chordmode { @@ -251,6 +253,8 @@ or create an inversion. The first number following the @code{:} is taken to be the extent of the chord. The chord is constructed by sequentially adding thirds to the root until the specified number has been reached. +Note that the seventh step added as part of an extended chord will be the +minor or flatted seventh, not the major seventh. If the extent is not a third (e.g., 6), thirds are added up to the highest third below the extent, and then the step of the extent is added. The largest possible value for the extent is 13. Any @@ -281,7 +285,9 @@ is added explicitly). @cindex additions, in chords Individual steps can be added to a chord. Additions follow the -extent and are prefixed by a dot (@code{.}). +extent and are prefixed by a dot (@code{.}). The basic seventh +step added to a chord is the minor or flatted seventh, rather than +the major seventh. @lilypond[quote,verbatim,fragment,relative=1] \chordmode { diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely index 3479ffe055..26eeeedca8 100644 --- a/Documentation/user/fretted-strings.itely +++ b/Documentation/user/fretted-strings.itely @@ -912,7 +912,9 @@ In addition to fret diagrams, LilyPond stores an internal list of chord shapes. The chord shapes are fret diagrams that can be shifted along the neck to different posistions to provide different chords. Chord shapes can be added to the internal list and then used to define -predefined fret diagrams. Like fret diagrams, chord shapes can be +predefined fret diagrams. Because they can be moved to various +positions on the neck, chord shapes will normally not contain +any open strings. Like fret diagrams, chord shapes can be entered as either fret-diagram-terse strings or fret-diagram-verbose marking lists. diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely index 50d2b8119c..63ec3f5b98 100644 --- a/Documentation/user/keyboards.itely +++ b/Documentation/user/keyboards.itely @@ -600,10 +600,10 @@ repeats} @seealso Notation Reference: -@ruser{Tremolo repeats} -@ruser{Glissando} -@ruser{Arpeggio} -@ruser{Harmonics} +@ref{Tremolo repeats} +@ref{Glissando} +@ref{Arpeggio} +@ref{Harmonics} @node Harp pedals @unnumberedsubsubsec Harp pedals @@ -642,5 +642,5 @@ position (sharpened pitch), and @code{|} is the divider. A prefixed @seealso Notation Reference: -@ruser{Text scripts} -@ruser{Instrument Specific Markup} +@ref{Text scripts} +@ref{Instrument Specific Markup} diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index 435210b4a6..7e84e74d16 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -51,7 +51,7 @@ quarter note is entered using a @code{4} (since it is a 1/4 note), and a half note is entered using a @code{2} (since it is a 1/2 note). For notes longer than a whole you must use the @code{\longa} (a double breve) and @code{\breve} commands. -Durations as short as 64th notes may be specified. Shorter values +Durations as short as 128th notes may be specified. Shorter values are possible, but only as beamed notes. @c Two 64th notes are needed to obtain beams @@ -1453,7 +1453,9 @@ particular beam in the time signature in use, its beaming is controlled by three context properties: @code{measureLength}, @code{beatLength} and @code{beatGrouping}. These properties may be set in the @code{Score}, @code{Staff} or -@code{Voice} contexts to delimit their scope. +@code{Voice} contexts to delimit their scope. The default values +are set while processing @code{\time} commands, so the @code{\set} +commands must be placed after all @code{\time} commands. These determine the beaming as follows: diff --git a/THANKS b/THANKS index 1bd09c6b0c..8a077a16f8 100644 --- a/THANKS +++ b/THANKS @@ -40,7 +40,7 @@ Till Rettig - NR work Kurt Kroon - Glossary Updates, NR work Alard de Boer - Formatting Michael Rasmussen - Formatting -Trevor Baca - Inspirational Headwords +Trevor Bača - Inspirational Headwords Reinhold Kainhofer - Technical Aid Neil Puttock - Snippet Editor, Technical Aid diff --git a/VERSION b/VERSION index 6b884d8d83..3940f45862 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=12 -PATCH_LEVEL=0 +PATCH_LEVEL=1 MY_PATCH_LEVEL= diff --git a/buildscripts/www_post.py b/buildscripts/www_post.py index 29f80cf09f..1af5c922ec 100644 --- a/buildscripts/www_post.py +++ b/buildscripts/www_post.py @@ -47,7 +47,7 @@ dirs, symlinks, files = mirrortree.walk_tree ( tree_roots = doc_dirs, process_dirs = outdir, exclude_dirs = '(^|/)(' + r'|po|out|out-test|.*?[.]t2d|\w*?-root)(/|$)|Documentation/(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + ')', - find_files = r'.*?\.(?:midi|html|pdf|png|txt|i?ly|signature|css)$|VERSION', + find_files = r'.*?\.(?:midi|html|pdf|png|txt|i?ly|signature|css|zip|xml|mxl)$|VERSION', exclude_files = r'lily-[0-9a-f]+.*\.(pdf|txt)') # actual mirrorring stuff diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc index 49b5518f36..bedb100a00 100644 --- a/flower/file-cookie.cc +++ b/flower/file-cookie.cc @@ -15,12 +15,10 @@ extern "C" { } void * - lily_fopencookie (void *cookie, char const *modes, - lily_cookie_io_functions_t io_funcs) + lily_fopencookie (void *cookie, + char const * /* modes */, + lily_cookie_io_functions_t /* io_funcs */) { - (void) cookie; - (void) modes; - (void) io_funcs; assert (is_memory_stream (cookie)); return (FILE *) cookie; } diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc index 270438dcae..dbf6fd83f2 100644 --- a/flower/memory-stream.cc +++ b/flower/memory-stream.cc @@ -102,23 +102,19 @@ Memory_out_stream::writer (void *cookie, } ssize_t -Memory_out_stream::reader (void *cookie, - char *buffer, - size_t size) +Memory_out_stream::reader (void * /* cookie */, + char * /* buffer */, + size_t /* size */) { - (void) cookie; - (void) buffer; - (void) size; - assert (false); return 0; } int -Memory_out_stream::seeker (void *, off64_t *, int whence) +Memory_out_stream::seeker (void *, + off64_t *, + int) { - (void) whence; - assert (false); return 0; } diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly index 9e5b9dbe4b..25c6a2ba57 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.61" +\version "2.12.0" staffPiano = \new PianoStaff { \set Score.timing = ##f diff --git a/input/cary-layout.ly b/input/cary-layout.ly index 04655ddbb3..740a025086 100644 --- a/input/cary-layout.ly +++ b/input/cary-layout.ly @@ -1,5 +1,5 @@ -\version "2.11.61" +\version "2.12.0" \layout { indent = #0 diff --git a/input/cary.ly b/input/cary.ly index 6af5fe538f..d385da139e 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.65" +\version "2.12.0" \include "english.ly" \include "cary-layout.ly" diff --git a/input/example-1.ly b/input/example-1.ly index a4ea980eee..517be6e0bc 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.11.61" +\version "2.12.0" diff --git a/input/example-2.ly b/input/example-2.ly index 6deaa3d0a2..64282ab3c2 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.11.61" +\version "2.12.0" diff --git a/input/example-3.ly b/input/example-3.ly index c2827edb88..34291864c9 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.11.61" +\version "2.12.0" diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 7a420afbd3..3d88381fc5 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { composer = "ARTHUR GRAY" diff --git a/input/lsr/accordion-discant-symbols.ly b/input/lsr/accordion-discant-symbols.ly index f15e8e8520..c89e78f9ea 100644 --- a/input/lsr/accordion-discant-symbols.ly +++ b/input/lsr/accordion-discant-symbols.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards" diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index 9646eb384c..67c44bedb7 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords, ancient-notation, contexts-and-engravers" diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index 40ed554714..419d857959 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, staff-notation, vocal-music" diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly index e1583ddfaf..129ab0cbd5 100644 --- a/input/lsr/adding-an-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers, breaks" diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index cbc4b82ed2..f289584576 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/adding-bar-lines-to-chordnames-context.ly b/input/lsr/adding-bar-lines-to-chordnames-context.ly index 33f6d7a913..a28ffda079 100644 --- a/input/lsr/adding-bar-lines-to-chordnames-context.ly +++ b/input/lsr/adding-bar-lines-to-chordnames-context.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly index 6d785eddc9..c5077dc34c 100644 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, expressive-marks" diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index a205be720c..41127f6e32 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/input/lsr/adding-fingerings-to-a-score.ly index adf9cb98c2..5d2e7f0bbb 100644 --- a/input/lsr/adding-fingerings-to-a-score.ly +++ b/input/lsr/adding-fingerings-to-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, fretted-strings" diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index ae5c6bd067..c145d66cb6 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly index e05d2f9090..4f0a37147f 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly index c4a1393491..101014ec27 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "titles" diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly index 537a2aef4b..4425c6709d 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/additional-voices-to-avoid-collisions.ly b/input/lsr/additional-voices-to-avoid-collisions.ly index 462f0b76b6..e406cdc4ca 100644 --- a/input/lsr/additional-voices-to-avoid-collisions.ly +++ b/input/lsr/additional-voices-to-avoid-collisions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes" diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index a4006b90a0..83e15bd307 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music, spacing" diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly index e9e36c5c72..b82a86910f 100644 --- a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly +++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index 9c3a8a4d74..0a67d32d7c 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly index abacdeb058..f96a8ad0fe 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly index 6ed05bf779..08bfb23c84 100644 --- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly +++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, fretted-strings, spacing" diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly index 9d7f613114..91a3e295f5 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, vocal-music" diff --git a/input/lsr/ambitus.ly b/input/lsr/ambitus.ly index 3210a2c0fc..34ac16d14b 100644 --- a/input/lsr/ambitus.ly +++ b/input/lsr/ambitus.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, vocal-music" diff --git a/input/lsr/analysis-brackets-above-the-staff.ly b/input/lsr/analysis-brackets-above-the-staff.ly index ab6b0672b8..283078d0a4 100644 --- a/input/lsr/analysis-brackets-above-the-staff.ly +++ b/input/lsr/analysis-brackets-above-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index dfef3b9593..2f1f606a5b 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly index ce55d5c0de..b062352544 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly index df7987c8d0..b0462e0b32 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index e19f4c5488..e98c716c0a 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly index 7a56117afd..14feb5ed89 100644 --- a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, editorial-annotations" diff --git a/input/lsr/arabic-improvisation.ly b/input/lsr/arabic-improvisation.ly index 5c3883b59e..823823feda 100644 --- a/input/lsr/arabic-improvisation.ly +++ b/input/lsr/arabic-improvisation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index fcc24705ce..23aed5baab 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index 24ac984df1..b78275f82b 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly index 1afbc794f7..d91981e109 100644 --- a/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly +++ b/input/lsr/avoiding-collisions-of-chord-fingering-with-beams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides" diff --git a/input/lsr/beam-endings-in-score-context.ly b/input/lsr/beam-endings-in-score-context.ly index a45638027f..28aefed6fa 100644 --- a/input/lsr/beam-endings-in-score-context.ly +++ b/input/lsr/beam-endings-in-score-context.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/beam-grouping-in-7-8-time.ly b/input/lsr/beam-grouping-in-7-8-time.ly index 49e34a00b7..d31487662e 100644 --- a/input/lsr/beam-grouping-in-7-8-time.ly +++ b/input/lsr/beam-grouping-in-7-8-time.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/beams-across-line-breaks.ly b/input/lsr/beams-across-line-breaks.ly index 4d7444762a..72655a3c5d 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index 8a161e2784..fd7e5cea83 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, text" diff --git a/input/lsr/book-parts.ly b/input/lsr/book-parts.ly index 8cd6e3a057..ebec6023e5 100644 --- a/input/lsr/book-parts.ly +++ b/input/lsr/book-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "paper-and-layout" diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly index cd9c2a1dd2..513dbfb378 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index 8eb5ccaa5c..4cc3216d2d 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index d27a559a9f..4de19c7842 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 682304df15..a88f2aa24b 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index 3f554f87c9..2009bb2528 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, unfretted-strings" diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly index eaed554efd..24ff68630b 100644 --- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly +++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/changing-beam-knee-gap.ly b/input/lsr/changing-beam-knee-gap.ly index ba84235972..0ada10784b 100644 --- a/input/lsr/changing-beam-knee-gap.ly +++ b/input/lsr/changing-beam-knee-gap.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/changing-chord-separator.ly b/input/lsr/changing-chord-separator.ly index b6ccb4c54a..8bd86dab51 100644 --- a/input/lsr/changing-chord-separator.ly +++ b/input/lsr/changing-chord-separator.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly index f84b1e6045..14e8b6eee0 100644 --- a/input/lsr/changing-form-of-multi--measure-rests.ly +++ b/input/lsr/changing-form-of-multi--measure-rests.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Cambiar la forma de los silencios multicompás" texidoces = " diff --git a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly index 6e90081273..748bf2c2e6 100644 --- a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly +++ b/input/lsr/changing-midi-output-to-one-channel-per-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "contexts-and-engravers, midi" diff --git a/input/lsr/changing-partcombine-texts.ly b/input/lsr/changing-partcombine-texts.ly index 369c7f3659..1963230ea0 100644 --- a/input/lsr/changing-partcombine-texts.ly +++ b/input/lsr/changing-partcombine-texts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes" diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index 202c906c93..129c8fc9b4 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" diff --git a/input/lsr/changing-stanza-fonts.ly b/input/lsr/changing-stanza-fonts.ly index 03cda1d63f..9d706bd94e 100644 --- a/input/lsr/changing-stanza-fonts.ly +++ b/input/lsr/changing-stanza-fonts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music" diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly index c92da3b259..adb48b0850 100644 --- a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Se puede modificar el texto empleado para los crescendos y diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 6888684bba..99f64e2d33 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, editorial-annotations" diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly index b15b266cd0..ed6d49f12d 100644 --- a/input/lsr/changing-the-breath-mark-symbol.ly +++ b/input/lsr/changing-the-breath-mark-symbol.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index edaa5fc9bb..c61781337c 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index a7e15dc84c..d73371c642 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, tweaks-and-overrides" diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index 0425e1c69d..e2fdedc293 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly index b7c0748d25..79e9d2e31b 100644 --- a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly +++ b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index e87600a400..a699f9ee6b 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout" diff --git a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly b/input/lsr/changing-the-tempo-without-a-metronome-mark.ly index 6522c35216..b3a1c31a63 100644 --- a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly +++ b/input/lsr/changing-the-tempo-without-a-metronome-mark.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly b/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly index e249222420..ac62f3aa72 100644 --- a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly +++ b/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index db11beae39..c540db358e 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly index cd9459cc17..be7f455db3 100644 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " La propiedad @code{measureLength}, junto con diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 0469943163..988f1c1f50 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers" diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index 7e1101341c..b43262ade8 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/chord-name-major7.ly b/input/lsr/chord-name-major7.ly index 5c418c4387..d071f2d1de 100644 --- a/input/lsr/chord-name-major7.ly +++ b/input/lsr/chord-name-major7.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly index b6fb468e20..c9ecf938c1 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or % "Special output" might be more adequate -jm diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index 3b595949e8..5c97720fe9 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, chords, keyboards" diff --git a/input/lsr/coloring-notes-depending-on-their-pitch.ly b/input/lsr/coloring-notes-depending-on-their-pitch.ly index 9b8d773b7d..2a9a5a810d 100644 --- a/input/lsr/coloring-notes-depending-on-their-pitch.ly +++ b/input/lsr/coloring-notes-depending-on-their-pitch.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches,editorial-annotations,really-cool" texidoc = " diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index c2f4e69df6..9062d62d11 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index 198930cfb2..750d4cb9c4 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, text" diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index 4adb6c9dab..a75cc8eb58 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Indicaciones de compases compuestos" diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 42476981d8..91dfebd58c 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly index 06d4b1124e..20661cd9bd 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly index fd94c6c3cf..877fd09403 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, chords, keyboards, fretted-strings" diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly index b21337b388..425752eb54 100644 --- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index 9e913f1f2c..c14b672ca8 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index add095dc8e..9098fe7927 100644 --- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly index 24e5bfa60f..d392f5b760 100644 --- a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly +++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index 11084d69c7..c26a5be090 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly index 8a60f3a291..e32d8cda16 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly index cf1c9613ba..f58ff2e8a3 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-metronome-marks-in-markup-mode.ly b/input/lsr/creating-metronome-marks-in-markup-mode.ly index 3f74ec1d86..76a61d55a4 100644 --- a/input/lsr/creating-metronome-marks-in-markup-mode.ly +++ b/input/lsr/creating-metronome-marks-in-markup-mode.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly index fa4c547cad..69a523c113 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly index 861ac95658..31fe61796c 100644 --- a/input/lsr/creating-simultaneous-rehearsal-marks.ly +++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " A diferencia de las inscripciones de texto, las lestras de ensayo diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 0d5b4adf14..02b4cab45b 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, keyboards, unfretted-strings" diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 05ea88ba5d..d19cbbed91 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index 77d749bcce..6ff5dae026 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly index f819c35e77..d5847b2b7b 100644 --- a/input/lsr/customizing-fretboard-fret-diagrams.ly +++ b/input/lsr/customizing-fretboard-fret-diagrams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly index 09c6baeb0c..c8cbd7468c 100644 --- a/input/lsr/customizing-markup-fret-diagrams.ly +++ b/input/lsr/customizing-markup-fret-diagrams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly index 30f0c6c982..a1459f885d 100644 --- a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly +++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly index b820d61c84..cbf7067e34 100644 --- a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/lsr/defining-predefined-fretboards-for-other-instruments.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 0f179a373e..0ea3160296 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "midi" diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index cbba904926..804288c008 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly index b5b9ab0dab..9a9e8be8ee 100644 --- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Si hay un solo pentagrama en un de los tipos de sistema diff --git a/input/lsr/displaying-complex-chords.ly b/input/lsr/displaying-complex-chords.ly index 0499fb8e9c..ebe77122df 100644 --- a/input/lsr/displaying-complex-chords.ly +++ b/input/lsr/displaying-complex-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, chords" diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 9ac360411c..79ce6efa27 100644 --- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Alteraciones de estilo dodecafónico para todas las notas, incluidas las naturales" diff --git a/input/lsr/dotted-harmonics.ly b/input/lsr/dotted-harmonics.ly index b9f7c835a9..c19604aa2b 100644 --- a/input/lsr/dotted-harmonics.ly +++ b/input/lsr/dotted-harmonics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "unfretted-strings,tweaks-and-overrides" diff --git a/input/lsr/double-glissando.ly b/input/lsr/double-glissando.ly index 4bd91244f0..797641454f 100644 --- a/input/lsr/double-glissando.ly +++ b/input/lsr/double-glissando.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, simultaneous-notes" diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index eb185f7e58..76da5b97f0 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index 4fb6027c5c..d3db013fa6 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly index 3f90abc986..19ca959055 100644 --- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly +++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, text" diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index 4dc72d65f5..190f30b821 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "contexts-and-engravers" diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index bb63c771ec..f95d8e1abb 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly index 33e9ca391b..ffe26e9cc7 100644 --- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly +++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/faking-a-hammer-in-tablatures.ly b/input/lsr/faking-a-hammer-in-tablatures.ly index daf8ca74b9..e07b15f0bf 100644 --- a/input/lsr/faking-a-hammer-in-tablatures.ly +++ b/input/lsr/faking-a-hammer-in-tablatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/fine-tuning-pedal-brackets.ly b/input/lsr/fine-tuning-pedal-brackets.ly index d7a42b6dc5..cc9d16c3d3 100644 --- a/input/lsr/fine-tuning-pedal-brackets.ly +++ b/input/lsr/fine-tuning-pedal-brackets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards, tweaks-and-overrides" diff --git a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly index b2b1a9fe5a..371e9e787c 100644 --- a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly +++ b/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/flamenco-notation.ly b/input/lsr/flamenco-notation.ly index 25af5c6593..90b1c42dcd 100644 --- a/input/lsr/flamenco-notation.ly +++ b/input/lsr/flamenco-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/flat-flags-and-beam-nibs.ly b/input/lsr/flat-flags-and-beam-nibs.ly index 8a9e270cae..f0c30ffbee 100644 --- a/input/lsr/flat-flags-and-beam-nibs.ly +++ b/input/lsr/flat-flags-and-beam-nibs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/flute-slap-notation.ly b/input/lsr/flute-slap-notation.ly index c3d9f7cb39..c835631773 100644 --- a/input/lsr/flute-slap-notation.ly +++ b/input/lsr/flute-slap-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "winds" diff --git a/input/lsr/forcing-horizontal-shift-of-notes.ly b/input/lsr/forcing-horizontal-shift-of-notes.ly index 60d681d9db..a0841fcdb0 100644 --- a/input/lsr/forcing-horizontal-shift-of-notes.ly +++ b/input/lsr/forcing-horizontal-shift-of-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes, tweaks-and-overrides" diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index 4b859cf495..4bbf70d006 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly index 9d2061c0aa..54c0a1e7f1 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/input/lsr/fret-diagrams-explained-and-developed.ly index 45fa1f39f1..ff25b711c1 100644 --- a/input/lsr/fret-diagrams-explained-and-developed.ly +++ b/input/lsr/fret-diagrams-explained-and-developed.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index 1ee8d11f2c..f199ef1598 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/input/lsr/grid-lines--changing-their-appearance.ly index 26779bdfa1..93b3064f4d 100644 --- a/input/lsr/grid-lines--changing-their-appearance.ly +++ b/input/lsr/grid-lines--changing-their-appearance.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly index aacb4c3f09..3917bd9f31 100644 --- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/grouping-beats.ly b/input/lsr/grouping-beats.ly index ef6634f8a2..ee1af2a7b7 100644 --- a/input/lsr/grouping-beats.ly +++ b/input/lsr/grouping-beats.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly index 4759f62ebc..b77b8746e3 100644 --- a/input/lsr/guitar-strum-rhythms.ly +++ b/input/lsr/guitar-strum-rhythms.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 172e71a07b..7d87617dd5 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly index 8fad2ebff1..cb2c586c57 100644 --- a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly +++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly index 016712101d..bd46cf9f7e 100644 --- a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly +++ b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/how-to-change-fret-diagram-position.ly b/input/lsr/how-to-change-fret-diagram-position.ly index 278ca048e4..5f9b5502b9 100644 --- a/input/lsr/how-to-change-fret-diagram-position.ly +++ b/input/lsr/how-to-change-fret-diagram-position.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings, tweaks-and-overrides" diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index c7ec53eaa6..d5a8e585ab 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly index 5a5f80a47f..21bb835877 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Los «incipit» se pueden escribir utilizando el grob del nombre del diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly index 342e3ed8e0..ad2ff9d087 100644 --- a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly +++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards" diff --git a/input/lsr/inserting-a-caesura.ly b/input/lsr/inserting-a-caesura.ly index ffe8117fda..1cd862fd5c 100644 --- a/input/lsr/inserting-a-caesura.ly +++ b/input/lsr/inserting-a-caesura.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Las marcas de cesura se pueden crear sobreescribiendo la propiedad diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly index a5bb40d8f6..d20efa55f3 100644 --- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/lsr/isolated-percent-repeats.ly b/input/lsr/isolated-percent-repeats.ly index 9c0d1d3893..77c7777dac 100644 --- a/input/lsr/isolated-percent-repeats.ly +++ b/input/lsr/isolated-percent-repeats.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly index 668f3ce987..de4dea159e 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards, percussion, fretted-strings, template" diff --git a/input/lsr/laissez-vibrer-ties.ly b/input/lsr/laissez-vibrer-ties.ly index aea88092b2..b606db3ee4 100644 --- a/input/lsr/laissez-vibrer-ties.ly +++ b/input/lsr/laissez-vibrer-ties.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, keyboards, fretted-strings" diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly index 2035c1514b..beaaa0f723 100644 --- a/input/lsr/letter-tablature-formatting.ly +++ b/input/lsr/letter-tablature-formatting.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation,fretted-strings" diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index 49935ead3e..d3ef6af808 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { texidoces = " Se pueden aplicar puntas de flecha a los elementos de extensión de diff --git a/input/lsr/lyrics-alignment.ly b/input/lsr/lyrics-alignment.ly index bddcbf68e3..8b47e276d2 100644 --- a/input/lsr/lyrics-alignment.ly +++ b/input/lsr/lyrics-alignment.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/makam-example.ly b/input/lsr/makam-example.ly index 3607a2b9cd..eea080b8a4 100644 --- a/input/lsr/makam-example.ly +++ b/input/lsr/makam-example.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " El «Makam» es un tipo de melodía de Turquía que diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly index 16decdca0e..f334b8bbc7 100644 --- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly index f7ccb632f3..e1337cb3d5 100644 --- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly +++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, editorial-annotations" diff --git a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly index 572e96b655..09b41cc50b 100644 --- a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly +++ b/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index 8944342f33..30609a3b33 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly index 0723a77338..c5914fd259 100644 --- a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ b/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, vocal-music" diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 47a6a8d70b..48598d92c7 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/measure-counter.ly b/input/lsr/measure-counter.ly index 7fd6e33256..863bfaf0d2 100644 --- a/input/lsr/measure-counter.ly +++ b/input/lsr/measure-counter.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, staff-notation, editorial-annotations" diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly index 5882d43e38..e8370c5f1f 100644 --- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly index 64f9bca8d2..081ff01c58 100644 --- a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly +++ b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/modern-tab-text-clef.ly b/input/lsr/modern-tab-text-clef.ly index 725cd9a1ac..2b1d7a1d0c 100644 --- a/input/lsr/modern-tab-text-clef.ly +++ b/input/lsr/modern-tab-text-clef.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, fretted-strings" diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly index e468286b67..e3046d11c1 100644 --- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly +++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly index ef3d8609bc..d2ec9534be 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/multi--measure-rest-markup.ly b/input/lsr/multi--measure-rest-markup.ly index 5b1eba3792..cbf953b6f2 100644 --- a/input/lsr/multi--measure-rest-markup.ly +++ b/input/lsr/multi--measure-rest-markup.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/nesting-staves.ly b/input/lsr/nesting-staves.ly index 86c56a9ea6..26aecd057e 100644 --- a/input/lsr/nesting-staves.ly +++ b/input/lsr/nesting-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index 2a5f9792f6..cf3999b272 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, staff-notation" diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index 1a9b94a5a2..56175e1892 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, text" diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index bf5663a4a5..43ea09d16e 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index 17a644292a..e89c7bca33 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/lsr/percent-repeat-count-visibility.ly b/input/lsr/percent-repeat-count-visibility.ly index 58a5d77fbd..4a044846ba 100644 --- a/input/lsr/percent-repeat-count-visibility.ly +++ b/input/lsr/percent-repeat-count-visibility.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Se pueden mostrar los contadores de las repeticiones del tipo diff --git a/input/lsr/percent-repeat-counter.ly b/input/lsr/percent-repeat-counter.ly index 0a6ddc3ba0..0ffe523d76 100644 --- a/input/lsr/percent-repeat-counter.ly +++ b/input/lsr/percent-repeat-counter.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/percussion-beaters.ly b/input/lsr/percussion-beaters.ly index 350510ec7b..565bc6bf3e 100644 --- a/input/lsr/percussion-beaters.ly +++ b/input/lsr/percussion-beaters.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "percussion" diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index c2d43d501c..314976cf2d 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index 81c870c1f3..301251cb55 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "keyboards, template" diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly index a0fb402a06..3abe8bc938 100644 --- a/input/lsr/piano-template-with-centered-dynamics.ly +++ b/input/lsr/piano-template-with-centered-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index dfc38524b5..41e739639d 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, keyboards, template" diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index 745d62df44..44d6cd8d72 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/input/lsr/placement-of-right-hand-fingerings.ly index f93f8306ac..614a80484e 100644 --- a/input/lsr/placement-of-right-hand-fingerings.ly +++ b/input/lsr/placement-of-right-hand-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/polyphony-in-tablature.ly b/input/lsr/polyphony-in-tablature.ly index 66a6ce1b95..e3b2b63c84 100644 --- a/input/lsr/polyphony-in-tablature.ly +++ b/input/lsr/polyphony-in-tablature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly index e1b527a2a4..da9cb95bee 100644 --- a/input/lsr/positioning-multi--measure-rests.ly +++ b/input/lsr/positioning-multi--measure-rests.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Posicionar los silencios multicompás" texidoces = " diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index 9a811854fc..56b76912bc 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, breaks" diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly index 4fd66cf9e1..fdce5a11f8 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index 6ade673dd8..2ad0cf190c 100644 --- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly index df1222df08..f442f40c03 100644 --- a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly +++ b/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, tweaks-and-overrides" diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/input/lsr/printing-hairpins-using-al-niente-notation.ly index bec284d9a1..bd9f6ebcea 100644 --- a/input/lsr/printing-hairpins-using-al-niente-notation.ly +++ b/input/lsr/printing-hairpins-using-al-niente-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly index d39d802bee..ad787bf56f 100644 --- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly index 33283f41ec..b5a54da703 100644 --- a/input/lsr/printing-marks-on-every-staff.ly +++ b/input/lsr/printing-marks-on-every-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly index b208c5a507..2261494ebb 100644 --- a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly +++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides" diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 1957dfd782..3bfefdc1a4 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly index db416419a2..99da9c2b65 100644 --- a/input/lsr/proportional-strict-notespacing.ly +++ b/input/lsr/proportional-strict-notespacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly index e6275fbd39..4be2a04313 100644 --- a/input/lsr/quoting-another-voice-with-transposition.ly +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Los pasajes citados tienen en cuenta la transposición de la fuente diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly index d1c3834e0a..70cc428341 100644 --- a/input/lsr/quoting-another-voice.ly +++ b/input/lsr/quoting-another-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " La propiedad @code{quotedEventTypes} determina los tipos de diff --git a/input/lsr/removing-the-first-empty-line.ly b/input/lsr/removing-the-first-empty-line.ly index 62f142aa56..0cac0dec1a 100644 --- a/input/lsr/removing-the-first-empty-line.ly +++ b/input/lsr/removing-the-first-empty-line.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, tweaks-and-overrides, breaks" diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly index 5d37957d7c..9db722f727 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/reverting-default-beam-endings.ly b/input/lsr/reverting-default-beam-endings.ly index 1e717ab08f..f9950c69fe 100644 --- a/input/lsr/reverting-default-beam-endings.ly +++ b/input/lsr/reverting-default-beam-endings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 36e5e79d66..184a2905d3 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 4a583f70a1..364a273ad6 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "template" diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly index b2d3d600f3..fea5627e64 100644 --- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Si la nota que da fin a un regulador cae sobre la primera parte de diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/input/lsr/setting-the-minimum-length-of-hairpins.ly index 71d3f943c9..8def1f89cf 100644 --- a/input/lsr/setting-the-minimum-length-of-hairpins.ly +++ b/input/lsr/setting-the-minimum-length-of-hairpins.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly index d3c3b595d3..0c61ebeedb 100644 --- a/input/lsr/shortening-volta-brackets.ly +++ b/input/lsr/shortening-volta-brackets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/lsr/showing-chords-at-changes.ly b/input/lsr/showing-chords-at-changes.ly index 5900c44277..7146da898f 100644 --- a/input/lsr/showing-chords-at-changes.ly +++ b/input/lsr/showing-chords-at-changes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/simple-lead-sheet.ly b/input/lsr/simple-lead-sheet.ly index 89be9d4b26..a7f7df33df 100644 --- a/input/lsr/simple-lead-sheet.ly +++ b/input/lsr/simple-lead-sheet.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords" diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly index ebabdb5977..de800cec78 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, chords, template" diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly index b349d811fb..bff63283ea 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly index 8e9556549a..076191ee5f 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly index 4126defb6e..70c93f7ee6 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly index 25947a59cf..4bdbd0de3f 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "template" diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index 0934829308..803c57ccd1 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly index 4b99a709b8..e5d0dc5911 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly index ebedf4f2af..92b15d4b9a 100644 --- a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly +++ b/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, unfretted-strings" diff --git a/input/lsr/specifying-context-with-beatgrouping.ly b/input/lsr/specifying-context-with-beatgrouping.ly index 92ff6e7730..884f0824b2 100644 --- a/input/lsr/specifying-context-with-beatgrouping.ly +++ b/input/lsr/specifying-context-with-beatgrouping.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/stand-alone-two-column-markup.ly b/input/lsr/stand-alone-two-column-markup.ly index 69d0a94279..ef7219f27a 100644 --- a/input/lsr/stand-alone-two-column-markup.ly +++ b/input/lsr/stand-alone-two-column-markup.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly index 8706c48d0b..602dcc865f 100644 --- a/input/lsr/stem-and-beam-behavior-in-tablature.ly +++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "fretted-strings" diff --git a/input/lsr/stemlets.ly b/input/lsr/stemlets.ly index 190761f05d..ebb096ac5c 100644 --- a/input/lsr/stemlets.ly +++ b/input/lsr/stemlets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly index bdc55c02b3..72ff6105f2 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly index 03adb6505e..c6d4613aca 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/sub-dividing-beams.ly b/input/lsr/sub-dividing-beams.ly index 429b508d7d..cdc16b747e 100644 --- a/input/lsr/sub-dividing-beams.ly +++ b/input/lsr/sub-dividing-beams.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly index 82a2d1369f..50cfa3ccef 100644 --- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly +++ b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "simultaneous-notes,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly index bbdeb730bd..a669f51cba 100644 --- a/input/lsr/table-of-contents.ly +++ b/input/lsr/table-of-contents.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 0fe467cfc0..9b9c04f4a5 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, text" diff --git a/input/lsr/tick-bar-lines.ly b/input/lsr/tick-bar-lines.ly index bce7980715..458e522b58 100644 --- a/input/lsr/tick-bar-lines.ly +++ b/input/lsr/tick-bar-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "staff-notation" texidoc = " @@ -11,9 +11,10 @@ only for coordination and is not meant to imply any rhythmic stress. } % begin verbatim \relative c' { - c4 d e f \bar "'" - g4 f e d \bar "'" - c4 d e f \bar "'" + \set Score.defaultBarType = #"'" + c4 d e f + g4 f e d + c4 d e f g4 f e d \bar "|." } diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly index d338d860ec..054c9fb151 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, tweaks-and-overrides" diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly index a1badd8efd..ddfaf91613 100644 --- a/input/lsr/transcription-of-ancient-music-with-incipit.ly +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 153567c8ad..3c612c99eb 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { doctitlees = "Transportar música con el menor número de alteraciones" texidoces = " diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index 46a46bc935..c78b7e64f3 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly index e7a8dd9503..988e728318 100644 --- a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly +++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/using-beatlength-and-beatgrouping.ly b/input/lsr/using-beatlength-and-beatgrouping.ly index b77d4051de..616597a18a 100644 --- a/input/lsr/using-beatlength-and-beatgrouping.ly +++ b/input/lsr/using-beatlength-and-beatgrouping.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly index bd734bfe51..ea8a4889e3 100644 --- a/input/lsr/using-double-slurs-for-legato-chords.ly +++ b/input/lsr/using-double-slurs-for-legato-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly index 2a1c1a1718..4493628a99 100644 --- a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly +++ b/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index e2c925e815..04b33750c0 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly index 6bac1cb4b4..4ef94434c3 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly index 08ad8fb1dd..3fed51ec10 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly index 0cbe698333..3c07af3716 100644 --- a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-aligned-dynamics-and-textscripts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly index b019610295..9f6baade12 100644 --- a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly +++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index 654431e57f..138e0abe94 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, tweaks-and-overrides, spacing" diff --git a/input/lsr/vertically-centered-common-lyrics.ly b/input/lsr/vertically-centered-common-lyrics.ly index 803738bcf8..592a3700a6 100644 --- a/input/lsr/vertically-centered-common-lyrics.ly +++ b/input/lsr/vertically-centered-common-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music" diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly index 3bcf58da89..bd4605d93c 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index 463c3fd8df..7543e89160 100644 --- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "text, vocal-music, contexts-and-engravers, template" diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index 5633227431..0b529e3767 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly index 73679dcc2f..4f5934e67a 100644 --- a/input/lsr/volta-below-chords.ly +++ b/input/lsr/volta-below-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { texidoces = " Mediante la adición del grabador @code{Volta_engraver} al diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index f0ff2571be..b89cca5af8 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats,staff-notation" texidoc = "By adding the @code{Volta_engraver} to the relevant diff --git a/input/lsr/volta-text-markup-using-repeatcommands.ly b/input/lsr/volta-text-markup-using-repeatcommands.ly index 67fd8a1dba..4ea2d1952d 100644 --- a/input/lsr/volta-text-markup-using-repeatcommands.ly +++ b/input/lsr/volta-text-markup-using-repeatcommands.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/manual/ancient-headword.ly b/input/manual/ancient-headword.ly index 6b92df874f..3b1136e989 100644 --- a/input/manual/ancient-headword.ly +++ b/input/manual/ancient-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly index ceb1b90134..ccd42c54b7 100644 --- a/input/manual/chord-names-jazz.ly +++ b/input/manual/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \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 1641c3f7d7..e446afa4fb 100644 --- a/input/manual/chord-names-languages.ly +++ b/input/manual/chord-names-languages.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german diff --git a/input/manual/chords-headword.ly b/input/manual/chords-headword.ly index f1c477eefd..f8a661fd71 100644 --- a/input/manual/chords-headword.ly +++ b/input/manual/chords-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper{ ragged-right=##f diff --git a/input/manual/display-predefined-fretboards.ly b/input/manual/display-predefined-fretboards.ly index 7dd4ac914b..bf2283db3c 100644 --- a/input/manual/display-predefined-fretboards.ly +++ b/input/manual/display-predefined-fretboards.ly @@ -1,5 +1,5 @@ \include "predefined-guitar-fretboards.ly" -\version "2.11.61" +\version "2.12.0" mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break } diff --git a/input/manual/divisiones.ly b/input/manual/divisiones.ly index 97be62eddf..6307c9ac8c 100644 --- a/input/manual/divisiones.ly +++ b/input/manual/divisiones.ly @@ -9,7 +9,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior}, " } -\version "2.11.61" +\version "2.12.0" \include "gregorian.ly" diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly index f7d73eec09..b834181f48 100644 --- a/input/manual/editorial-headword.ly +++ b/input/manual/editorial-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/expressive-headword.ly b/input/manual/expressive-headword.ly index 1ea60271c0..ed62f91ee1 100644 --- a/input/manual/expressive-headword.ly +++ b/input/manual/expressive-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/input/manual/figured-bass-headword.ly b/input/manual/figured-bass-headword.ly index 14daed63a6..8f666920c0 100644 --- a/input/manual/figured-bass-headword.ly +++ b/input/manual/figured-bass-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper{ ragged-right=##f diff --git a/input/manual/font-table.ly b/input/manual/font-table.ly index 7c62a4ad28..c8e0876b5d 100644 --- a/input/manual/font-table.ly +++ b/input/manual/font-table.ly @@ -9,7 +9,7 @@ evenFooterMarkup = \markup {} } -\version "2.11.61" +\version "2.12.0" #(define-markup-command (doc-char layout props name) (string?) (interpret-markup layout props diff --git a/input/manual/fretted-headword.ly b/input/manual/fretted-headword.ly index faefb12c8b..dc97841f20 100644 --- a/input/manual/fretted-headword.ly +++ b/input/manual/fretted-headword.ly @@ -3,7 +3,7 @@ % on melodies from Bellini's "Norma" % %*****************************************************************% -\version "2.11.51" +\version "2.12.0" #(set-global-staff-size 15) \paper { diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly index 81ea9ec397..8793965d37 100644 --- a/input/manual/keyboard-headword.ly +++ b/input/manual/keyboard-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) diff --git a/input/manual/note-head-style.ly b/input/manual/note-head-style.ly index 05be352bdf..98d33a27f5 100644 --- a/input/manual/note-head-style.ly +++ b/input/manual/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header{ texidoc=" Note head shapes may be set from several choices. diff --git a/input/manual/percussion-chart.ly b/input/manual/percussion-chart.ly index f30cda1b67..cdbc6d7883 100644 --- a/input/manual/percussion-chart.ly +++ b/input/manual/percussion-chart.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" % yes, I know this is a mess. But I'm not going to fuss with % it one day before I leave. -gp diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly index 33d4006513..d69c44a97f 100644 --- a/input/manual/pitches-headword.ly +++ b/input/manual/pitches-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly index c23a20de6e..faba778a12 100644 --- a/input/manual/repeats-headword.ly +++ b/input/manual/repeats-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly index cc9a465fe7..a48f05ca9e 100644 --- a/input/manual/rhythms-headword.ly +++ b/input/manual/rhythms-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper { diff --git a/input/manual/screech-boink.ly b/input/manual/screech-boink.ly index 5b72a68d3c..a49cd240db 100644 --- a/input/manual/screech-boink.ly +++ b/input/manual/screech-boink.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { title = "Screech and boink" subtitle = "Random complex notation" diff --git a/input/manual/script-chart.ly b/input/manual/script-chart.ly index c2439fe941..5dc23d0dae 100644 --- a/input/manual/script-chart.ly +++ b/input/manual/script-chart.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" % this chart is used in the manual too. diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly index 156911d14a..a6b5ff8e47 100644 --- a/input/manual/simultaneous-headword.ly +++ b/input/manual/simultaneous-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly index ba9d1cb2df..f7fa2e4145 100644 --- a/input/manual/staff-headword.ly +++ b/input/manual/staff-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "catalan.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly index dd6b11856e..40af604f84 100644 --- a/input/manual/text-headword.ly +++ b/input/manual/text-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \include "english.ly" #(set-global-staff-size 15) \paper{ diff --git a/input/manual/unfretted-headword.ly b/input/manual/unfretted-headword.ly index 184ffd05bc..de75aa582c 100644 --- a/input/manual/unfretted-headword.ly +++ b/input/manual/unfretted-headword.ly @@ -21,7 +21,7 @@ %% Statement Date: Octber the 9th, 2008 -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) %%% diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly index 69ca7d35c3..6d8fa0a27b 100644 --- a/input/manual/wind-headword.ly +++ b/input/manual/wind-headword.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" #(set-global-staff-size 15) \paper { line-width = 16\cm diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 5e09b1424e..4f14732018 100644 --- a/input/mutopia-header.ly +++ b/input/mutopia-header.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \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 6d0047e469..268f413972 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.11.61" +\version "2.12.0" global = { \key a \minor diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 5717727557..b7941a4f55 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.11.61" +\version "2.12.0" manuscriptBreak = { \break } diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index c39c0a4ab8..10797cd6d9 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.11.61" +\version "2.12.0" #(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 731ceff949..7012fe762f 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.11.61" +\version "2.12.0" forcedLastBreak = { \break } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index dd41132afa..8ba1bb45af 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.11.61" +\version "2.12.0" %{ Header for Petites Preludes. diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index bead2fddfc..a92188df11 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.11.61" +\version "2.12.0" diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 0f37f3a1ed..a83fb3cec5 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.11.61" +\version "2.12.0" \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 5edd274ac3..4e983cebb5 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.11.61" +\version "2.12.0" \include "mozart-hrn3-defs.ily" \include "mozart-hrn3-allegro.ily" diff --git a/input/new/aligning-and-centering-instrument-names.ly b/input/new/aligning-and-centering-instrument-names.ly index 519ddde72d..6ad24e927d 100644 --- a/input/new/aligning-and-centering-instrument-names.ly +++ b/input/new/aligning-and-centering-instrument-names.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/new/aligning-marks-with-various-notation-objects.ly b/input/new/aligning-marks-with-various-notation-objects.ly index dc44a1aab1..79f78ef938 100644 --- a/input/new/aligning-marks-with-various-notation-objects.ly +++ b/input/new/aligning-marks-with-various-notation-objects.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/new/arabic-improvisation.ly b/input/new/arabic-improvisation.ly index e45e14e364..06348916f5 100644 --- a/input/new/arabic-improvisation.ly +++ b/input/new/arabic-improvisation.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "world-music" diff --git a/input/new/book-parts.ly b/input/new/book-parts.ly index abb56b8460..33a624caba 100644 --- a/input/new/book-parts.ly +++ b/input/new/book-parts.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "paper-and-layout" diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly index 7eddf3a961..839b361065 100644 --- a/input/new/broken-crescendo-hairpin.ly +++ b/input/new/broken-crescendo-hairpin.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks" diff --git a/input/new/center-text-below-hairpin-dynamics.ly b/input/new/center-text-below-hairpin-dynamics.ly index eae6943619..769f735fb3 100644 --- a/input/new/center-text-below-hairpin-dynamics.ly +++ b/input/new/center-text-below-hairpin-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "expressive-marks, text" diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly index 0ba6809bc4..2803fc5842 100644 --- a/input/new/changing-form-of-multi--measure-rests.ly +++ b/input/new/changing-form-of-multi--measure-rests.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/changing-properties-for-individual-grobs.ly b/input/new/changing-properties-for-individual-grobs.ly index 416e5520d9..714ae7e172 100644 --- a/input/new/changing-properties-for-individual-grobs.ly +++ b/input/new/changing-properties-for-individual-grobs.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" diff --git a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly index 7d41aa87f3..956f3bdcbe 100644 --- a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/changing-the-tempo-without-a-metronome-mark.ly b/input/new/changing-the-tempo-without-a-metronome-mark.ly index 446a3de2c4..f64adcc61e 100644 --- a/input/new/changing-the-tempo-without-a-metronome-mark.ly +++ b/input/new/changing-the-tempo-without-a-metronome-mark.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly index 18a0527055..f7007eb1ce 100644 --- a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,contexts-and-engravers" texidoc = "The @code{measureLength} property, together with diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly index e37bf09df1..49532ac21e 100644 --- a/input/new/clip-systems.ly +++ b/input/new/clip-systems.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or % "Special output" might be more adequate -jm diff --git a/input/new/coloring-notes-depending-on-their-pitch.ly b/input/new/coloring-notes-depending-on-their-pitch.ly index 5b32ef424e..6359c293ae 100644 --- a/input/new/coloring-notes-depending-on-their-pitch.ly +++ b/input/new/coloring-notes-depending-on-their-pitch.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches,editorial-annotations,really-cool" texidoc = " diff --git a/input/new/compound-time-signatures.ly b/input/new/compound-time-signatures.ly index 1e5442d1dd..b55a3fdc12 100644 --- a/input/new/compound-time-signatures.ly +++ b/input/new/compound-time-signatures.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/new/creating-metronome-marks-in-markup-mode.ly b/input/new/creating-metronome-marks-in-markup-mode.ly index f52d838298..bb1379bdfd 100644 --- a/input/new/creating-metronome-marks-in-markup-mode.ly +++ b/input/new/creating-metronome-marks-in-markup-mode.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "staff-notation" diff --git a/input/new/creating-simultaneous-rehearsal-marks.ly b/input/new/creating-simultaneous-rehearsal-marks.ly index a7f003d859..2f065dd3be 100644 --- a/input/new/creating-simultaneous-rehearsal-marks.ly +++ b/input/new/creating-simultaneous-rehearsal-marks.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks,text,tweaks-and-overrides" texidoc = " diff --git a/input/new/creating-text-spanners.ly b/input/new/creating-text-spanners.ly index 7c0770eaa6..0d89056fb5 100644 --- a/input/new/creating-text-spanners.ly +++ b/input/new/creating-text-spanners.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "expressive-marks, text, tweaks-and-overrides" diff --git a/input/new/customizing-fretboard-fret-diagrams.ly b/input/new/customizing-fretboard-fret-diagrams.ly index 3b6c03165f..1f4d8cb2b5 100644 --- a/input/new/customizing-fretboard-fret-diagrams.ly +++ b/input/new/customizing-fretboard-fret-diagrams.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/new/customizing-markup-fret-diagrams.ly b/input/new/customizing-markup-fret-diagrams.ly index b50ee4acdb..c3d03fd9b1 100644 --- a/input/new/customizing-markup-fret-diagrams.ly +++ b/input/new/customizing-markup-fret-diagrams.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/new/defining-predefined-fretboards-for-other-instruments.ly b/input/new/defining-predefined-fretboards-for-other-instruments.ly index b8f0568ae4..f38d4a2fbe 100644 --- a/input/new/defining-predefined-fretboards-for-other-instruments.ly +++ b/input/new/defining-predefined-fretboards-for-other-instruments.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "fretted-strings" texidoc = "Predefined fret diagrams can be added for new instruments diff --git a/input/new/display-bracket-with-only-one-staff-in-a-system.ly b/input/new/display-bracket-with-only-one-staff-in-a-system.ly index f38616e553..87e416b30d 100644 --- a/input/new/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/new/display-bracket-with-only-one-staff-in-a-system.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation,tweaks-and-overrides" texidoc = "If there is only one staff in one of the staff types diff --git a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index 0a9729cae4..ee2eab0e1b 100644 --- a/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "pitches" diff --git a/input/new/dotted-harmonics.ly b/input/new/dotted-harmonics.ly index 83d112db3d..43cdd3b141 100644 --- a/input/new/dotted-harmonics.ly +++ b/input/new/dotted-harmonics.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "unfretted-strings,tweaks-and-overrides" diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly index 9d615d2479..9d53c90cb3 100644 --- a/input/new/drawing-boxes-around-grobs.ly +++ b/input/new/drawing-boxes-around-grobs.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly index 2ed0bde504..27318e7b78 100644 --- a/input/new/drawing-circles-around-various-objects.ly +++ b/input/new/drawing-circles-around-various-objects.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/new/fine-tuning-pedal-brackets.ly b/input/new/fine-tuning-pedal-brackets.ly index 534431c064..e3a2344615 100644 --- a/input/new/fine-tuning-pedal-brackets.ly +++ b/input/new/fine-tuning-pedal-brackets.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "keyboards, tweaks-and-overrides" diff --git a/input/new/flute-slap-notation.ly b/input/new/flute-slap-notation.ly index c006238be5..35f8987060 100644 --- a/input/new/flute-slap-notation.ly +++ b/input/new/flute-slap-notation.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "winds" diff --git a/input/new/fret-diagrams-explained-and-developed.ly b/input/new/fret-diagrams-explained-and-developed.ly index efe6c79c8c..a5b548e497 100644 --- a/input/new/fret-diagrams-explained-and-developed.ly +++ b/input/new/fret-diagrams-explained-and-developed.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "fretted-strings,tweaks-and-overrides" diff --git a/input/new/guitar-strum-rhythms.ly b/input/new/guitar-strum-rhythms.ly index c4aaced334..7def51448f 100644 --- a/input/new/guitar-strum-rhythms.ly +++ b/input/new/guitar-strum-rhythms.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,fretted-strings" diff --git a/input/new/heavily-customized-polymetric-time-signatures.ly b/input/new/heavily-customized-polymetric-time-signatures.ly index acca7f225b..8e6d38da51 100644 --- a/input/new/heavily-customized-polymetric-time-signatures.ly +++ b/input/new/heavily-customized-polymetric-time-signatures.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "rhythms, percussion" diff --git a/input/new/incipit.ly b/input/new/incipit.ly index 3e3cc41edd..4df3bb2f96 100644 --- a/input/new/incipit.ly +++ b/input/new/incipit.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation,ancient-notation" texidoc = "Incipits can be added using the instrument name grob, but diff --git a/input/new/inserting-a-caesura.ly b/input/new/inserting-a-caesura.ly index 75c478070a..c143675851 100644 --- a/input/new/inserting-a-caesura.ly +++ b/input/new/inserting-a-caesura.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks,tweaks-and-overrides" texidoc = " diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly index e357cc6ff2..79da84dff5 100644 --- a/input/new/letter-tablature-formatting.ly +++ b/input/new/letter-tablature-formatting.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation,fretted-strings" diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly index cba3a1d2e6..7fbc9d6017 100644 --- a/input/new/line-arrows.ly +++ b/input/new/line-arrows.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "expressive-marks" texidoc = "Arrows can be applied to text-spanners and line-spanners diff --git a/input/new/makam-example.ly b/input/new/makam-example.ly index d8842521f8..9e88142120 100644 --- a/input/new/makam-example.ly +++ b/input/new/makam-example.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches,world-music" texidoc = "Makam is a type of melody from Turkey using 1/9th-tone diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly index 7dcc5ebe49..501ccd2b9d 100644 --- a/input/new/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly index 7d5128e091..184bd48e3b 100644 --- a/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly +++ b/input/new/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { lsrtags = "editorial-annotations, vocal-music" diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly index 24346da796..bc32520f8d 100644 --- a/input/new/markup-lines.ly +++ b/input/new/markup-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/new/modern-tab-text-clef.ly b/input/new/modern-tab-text-clef.ly index e30bda8183..fa7dadee7d 100644 --- a/input/new/modern-tab-text-clef.ly +++ b/input/new/modern-tab-text-clef.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation, fretted-strings" diff --git a/input/new/multi--measure-rest-markup.ly b/input/new/multi--measure-rest-markup.ly index f75cf29724..ffb1b3a347 100644 --- a/input/new/multi--measure-rest-markup.ly +++ b/input/new/multi--measure-rest-markup.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms, text" diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly index 61ce869335..e573ade326 100644 --- a/input/new/outputting-the-version-number.ly +++ b/input/new/outputting-the-version-number.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "text" diff --git a/input/new/page-label.ly b/input/new/page-label.ly index 40d4893089..657ea9efc6 100644 --- a/input/new/page-label.ly +++ b/input/new/page-label.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/new/percent-repeat-count-visibility.ly b/input/new/percent-repeat-count-visibility.ly index 31c01ee1ce..3ae1e129ad 100644 --- a/input/new/percent-repeat-count-visibility.ly +++ b/input/new/percent-repeat-count-visibility.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { lsrtags = "repeats, tweaks-and-overrides" texidoc = " diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly index 49c70a66c5..7bc5cd5b4e 100644 --- a/input/new/piano-template-with-centered-dynamics.ly +++ b/input/new/piano-template-with-centered-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks,keyboards,template" diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly index fcb8a181f5..235b8baad1 100644 --- a/input/new/positioning-multi--measure-rests.ly +++ b/input/new/positioning-multi--measure-rests.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly index 53768e2f15..7a87f41d7c 100644 --- a/input/new/quoting-another-voice-with-transposition.ly +++ b/input/new/quoting-another-voice-with-transposition.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches,staff-notation" texidoc = "Quotations take into account the transposition of both diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly index b0e75a9d32..13da99eacd 100644 --- a/input/new/quoting-another-voice.ly +++ b/input/new/quoting-another-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "staff-notation" texidoc = "The @code{quotedEventTypes} property determines the diff --git a/input/new/setting-hairpin-behavior-at-bar-lines.ly b/input/new/setting-hairpin-behavior-at-bar-lines.ly index 46197a7933..a6dd6584b1 100644 --- a/input/new/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "expressive-marks" texidoc = "If the note which ends a hairpin falls on a downbeat, diff --git a/input/new/specifying-context-with-beatgrouping.ly b/input/new/specifying-context-with-beatgrouping.ly index e3ee5126a5..71ef3530c7 100644 --- a/input/new/specifying-context-with-beatgrouping.ly +++ b/input/new/specifying-context-with-beatgrouping.ly @@ -1,11 +1,13 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms" texidoc = " By specifying the context, the effect of @code{beatGrouping} can be limited to the context specified, and the values which may have -been set in higher-level contexts can be overridden: +been set in higher-level contexts can be overridden. The +@code{\set} commands must be placed @emph{after} all @code{\time} +commands: " doctitle = "Specifying context with beatGrouping" } diff --git a/input/new/suppressing-warnings-for-clashing-note-columns.ly b/input/new/suppressing-warnings-for-clashing-note-columns.ly index ea6dab0a8a..5dbf28df0d 100644 --- a/input/new/suppressing-warnings-for-clashing-note-columns.ly +++ b/input/new/suppressing-warnings-for-clashing-note-columns.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "simultaneous-notes,tweaks-and-overrides" texidoc = " diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly index 1094712ec2..f639c06222 100644 --- a/input/new/table-of-contents.ly +++ b/input/new/table-of-contents.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using diff --git a/input/new/tick-bar-lines.ly b/input/new/tick-bar-lines.ly index 8493fa5e29..d237aa67da 100644 --- a/input/new/tick-bar-lines.ly +++ b/input/new/tick-bar-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { lsrtags = "staff-notation" texidoc = " @@ -8,9 +8,10 @@ only for coordination and is not meant to imply any rhythmic stress. doctitle = "Tick bar lines" } \relative c' { - c4 d e f \bar "'" - g4 f e d \bar "'" - c4 d e f \bar "'" + \set Score.defaultBarType = #"'" + c4 d e f + g4 f e d + c4 d e f g4 f e d \bar "|." } diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index 070ba64fcf..84de7611ec 100644 --- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "pitches" texidoc = "This example uses some Scheme code to enforce enharmonic diff --git a/input/new/using-beatlength-and-beatgrouping.ly b/input/new/using-beatlength-and-beatgrouping.ly index fe01180448..fd3c776392 100644 --- a/input/new/using-beatlength-and-beatgrouping.ly +++ b/input/new/using-beatlength-and-beatgrouping.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "rhythms" diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly index b6981653ac..77f574d359 100644 --- a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly index 0917969465..e79f0c5831 100644 --- a/input/new/utf-8.ly +++ b/input/new/utf-8.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/new/volta-below-chords.ly b/input/new/volta-below-chords.ly index 63394d4402..1b054a756c 100644 --- a/input/new/volta-below-chords.ly +++ b/input/new/volta-below-chords.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "repeats,staff-notation,chords" texidoc = "By adding the @code{Volta_engraver} to the relevant diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly index 4b0f121a26..a45dddec74 100644 --- a/input/new/volta-multi-staff.ly +++ b/input/new/volta-multi-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "repeats,staff-notation" texidoc = "By adding the @code{Volta_engraver} to the relevant diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly index 73522a37d9..a12c28599c 100644 --- a/input/new/volta-text-markup-using-repeatcommands.ly +++ b/input/new/volta-text-markup-using-repeatcommands.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { lsrtags = "repeats" diff --git a/input/proportional.ly b/input/proportional.ly index 8f3d806ee7..4ee27da27a 100644 --- a/input/proportional.ly +++ b/input/proportional.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index f458fdbf95..f05fa6a0a7 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { title = "Puer natus est nobis" subtitle = "Antiphona ad introitum VII" diff --git a/input/regression/accidental-ancient.ly b/input/regression/accidental-ancient.ly index f026960faa..47fe5bd22a 100644 --- a/input/regression/accidental-ancient.ly +++ b/input/regression/accidental-ancient.ly @@ -6,7 +6,7 @@ are collected here. " } -\version "2.11.51" +\version "2.12.0" \relative c'' { \time 3/4 diff --git a/input/regression/accidental-broken-tie-spacing.ly b/input/regression/accidental-broken-tie-spacing.ly index 9a6fb0d350..6f4bc120af 100644 --- a/input/regression/accidental-broken-tie-spacing.ly +++ b/input/regression/accidental-broken-tie-spacing.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a tie is broken, the spacing engine must consider the diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index c622833bfd..87c7bda814 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Cautionary accidentals may be indicated using either diff --git a/input/regression/accidental-clef-change.ly b/input/regression/accidental-clef-change.ly index d1e287176b..c927e693f7 100644 --- a/input/regression/accidental-clef-change.ly +++ b/input/regression/accidental-clef-change.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff \relative c' { \clef treble cis dis fis diff --git a/input/regression/accidental-collision.ly b/input/regression/accidental-collision.ly index 5b3131cfa7..062e1f8cf4 100644 --- a/input/regression/accidental-collision.ly +++ b/input/regression/accidental-collision.ly @@ -2,7 +2,7 @@ texidoc = "accidentals avoid stems of other notes too." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/accidental-contemporary.ly b/input/regression/accidental-contemporary.ly index 1c021d57fe..9da5027861 100644 --- a/input/regression/accidental-contemporary.ly +++ b/input/regression/accidental-contemporary.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "Several automatic accidental rules diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 6188420e9f..3d91d10f11 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-forced-tie-barline.ly b/input/regression/accidental-forced-tie-barline.ly index e5c24ddd41..0511b85163 100644 --- a/input/regression/accidental-forced-tie-barline.ly +++ b/input/regression/accidental-forced-tie-barline.ly @@ -1,4 +1,4 @@ -\version "2.11.53" +\version "2.12.0" \header { texidoc = "Cautionary accidentals applied to tied notes after a diff --git a/input/regression/accidental-forced-tie.ly b/input/regression/accidental-forced-tie.ly index 5d553f069c..e28d873672 100644 --- a/input/regression/accidental-forced-tie.ly +++ b/input/regression/accidental-forced-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals can be forced with ! and ? even if the notes are tied." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 9cc5807d50..51dfe52819 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index f95013453c..129f579599 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly index 1d09a342fe..1c85862ed7 100644 --- a/input/regression/accidental-piano.ly +++ b/input/regression/accidental-piano.ly @@ -6,7 +6,7 @@ accidental." } -\version "2.11.51" +\version "2.12.0" \layout { diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index 9bd279aa55..a7ed3c6420 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly index 82857bdb0b..165e4c15a3 100644 --- a/input/regression/accidental-quarter.ly +++ b/input/regression/accidental-quarter.ly @@ -3,7 +3,7 @@ texidoc = "Quarter tone notation is supported, including threequarters flat." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative c'' { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 5776a79ea8..b69bfe67dd 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-suggestions.ly b/input/regression/accidental-suggestions.ly index 102de5fac3..3e0ae0c72e 100644 --- a/input/regression/accidental-suggestions.ly +++ b/input/regression/accidental-suggestions.ly @@ -7,7 +7,7 @@ denoting Musica Ficta." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly index 31c40b402e..04a4b372d1 100644 --- a/input/regression/accidental-tie.ly +++ b/input/regression/accidental-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The second and third notes should not get accidentals, diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 831a84cc01..a9857e4026 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) do not wreak havoc in the spacing when unbroken." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index 5896571607..a1be03b654 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \header{ diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 5eb60e071b..587ef751fd 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly index 25d8b9a7e8..a5bec4114f 100644 --- a/input/regression/alignment-order.ly +++ b/input/regression/alignment-order.ly @@ -3,7 +3,7 @@ anywhere in the vertical alignment. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/alignment-vertical-manual-setting.ly b/input/regression/alignment-vertical-manual-setting.ly index 0fee0e483a..b176e931ce 100644 --- a/input/regression/alignment-vertical-manual-setting.ly +++ b/input/regression/alignment-vertical-manual-setting.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \book { \score { diff --git a/input/regression/alignment-vertical-spacing.ly b/input/regression/alignment-vertical-spacing.ly index 542957ab3c..2140e3754e 100644 --- a/input/regression/alignment-vertical-spacing.ly +++ b/input/regression/alignment-vertical-spacing.ly @@ -16,7 +16,7 @@ setting properties on individual object. @code{\override} in a } -\version "2.11.51" +\version "2.12.0" #(set-global-staff-size 13) diff --git a/input/regression/ambitus-pitch-ordering.ly b/input/regression/ambitus-pitch-ordering.ly index e47ee60515..91b2d86d97 100644 --- a/input/regression/ambitus-pitch-ordering.ly +++ b/input/regression/ambitus-pitch-ordering.ly @@ -2,7 +2,7 @@ texidoc = "Ambituses use actual pitch not lexicographic ordering." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right=##t diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index d0099af68a..f53e3e987b 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -6,7 +6,7 @@ signature. @code{AmbitusNoteHead} grobs also have ledger lines. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index c5c3ac7f47..afa55683f3 100644 --- a/input/regression/apply-context.ly +++ b/input/regression/apply-context.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 28f020e519..d107e4a42f 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The @code{\applyOutput} expression is the most flexible way to diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly index 7e4275c1a8..3446871a65 100644 --- a/input/regression/arpeggio-bracket.ly +++ b/input/regression/arpeggio-bracket.ly @@ -1,7 +1,7 @@ \layout { ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" A square bracket on the left indicates that the player should not diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index c95c6111f3..ba82ac1293 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads." diff --git a/input/regression/arpeggio-no-overshoot.ly b/input/regression/arpeggio-no-overshoot.ly index ec47ee1181..7b10077911 100644 --- a/input/regression/arpeggio-no-overshoot.ly +++ b/input/regression/arpeggio-no-overshoot.ly @@ -1,4 +1,4 @@ -\version "2.11.62" +\version "2.12.0" \header { texidoc = "Arpeggios do not overshoot the highest note head. diff --git a/input/regression/arpeggio-parenthesis.ly b/input/regression/arpeggio-parenthesis.ly index 50b4d4d966..dd43018272 100644 --- a/input/regression/arpeggio-parenthesis.ly +++ b/input/regression/arpeggio-parenthesis.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c' { \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur diff --git a/input/regression/arpeggio-span-one-staff.ly b/input/regression/arpeggio-span-one-staff.ly index 5618945772..03712af013 100644 --- a/input/regression/arpeggio-span-one-staff.ly +++ b/input/regression/arpeggio-span-one-staff.ly @@ -2,7 +2,7 @@ texidoc = "Span arpeggios within one staff also work" } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \new PianoStaff << diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 03064d23f1..abe2054cd5 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. diff --git a/input/regression/augmentum.ly b/input/regression/augmentum.ly index 7abc308b5c..2d5d2f7423 100644 --- a/input/regression/augmentum.ly +++ b/input/regression/augmentum.ly @@ -2,7 +2,7 @@ texidoc = "Augmentum dots are accounted for in horizontal spacing." } -\version "2.11.51" +\version "2.12.0" \include "gregorian.ly" \score { diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index db1a655191..19ec38d721 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="No auto beams will be put over (manual) repeat bars." diff --git a/input/regression/auto-beam-beaming-override.ly b/input/regression/auto-beam-beaming-override.ly index a1cd104fac..afa8b99160 100644 --- a/input/regression/auto-beam-beaming-override.ly +++ b/input/regression/auto-beam-beaming-override.ly @@ -8,7 +8,7 @@ beaming pattern related functions at the start of an autobeam." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } { \time 2/4 diff --git a/input/regression/auto-beam-beat-grouping.ly b/input/regression/auto-beam-beat-grouping.ly index 1020d4216a..1a9761d2db 100644 --- a/input/regression/auto-beam-beat-grouping.ly +++ b/input/regression/auto-beam-beat-grouping.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Autobeaming will break beams according to beatGrouping diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly index 449a751f28..e0656c40ad 100644 --- a/input/regression/auto-beam-no-beam.ly +++ b/input/regression/auto-beam-no-beam.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 1467c06dd3..01cee7f831 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -4,7 +4,7 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } \relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index 178c2b6821..bf62d31599 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index a5d5c06b30..cb7f369840 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -3,7 +3,7 @@ beam." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 9b294e0382..8cbaa3db20 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly index fdd5567c42..3806b37c02 100644 --- a/input/regression/backend-excercise.ly +++ b/input/regression/backend-excercise.ly @@ -2,7 +2,7 @@ texidoc = "Excercise all output functions" } -\version "2.11.53" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/backend-svg.ly b/input/regression/backend-svg.ly index 59cef068bc..69116f1b38 100644 --- a/input/regression/backend-svg.ly +++ b/input/regression/backend-svg.ly @@ -5,7 +5,7 @@ \include "typography-demo.ly" -\version "2.11.51" +\version "2.12.0" #(define outname (ly:parser-output-name parser)) diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index dadbe95d69..a60f89e57c 100644 --- a/input/regression/balloon.ly +++ b/input/regression/balloon.ly @@ -5,7 +5,7 @@ with lines and explanatory text added." } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right = ##t } diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly index cbf52ecbe0..7a11169537 100644 --- a/input/regression/bar-check-redefine.ly +++ b/input/regression/bar-check-redefine.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The meaning of @code{|} is stored in the identifier @code{pipeSymbol}." diff --git a/input/regression/bar-line-dashed.ly b/input/regression/bar-line-dashed.ly index a1b0ec3288..4267f02490 100644 --- a/input/regression/bar-line-dashed.ly +++ b/input/regression/bar-line-dashed.ly @@ -3,7 +3,7 @@ lines exactly. Dashed barlines between staves start and end on a half dash precisely." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/bar-line-dotted.ly b/input/regression/bar-line-dotted.ly index df599712a6..f662c3c9e4 100644 --- a/input/regression/bar-line-dotted.ly +++ b/input/regression/bar-line-dotted.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/bar-line-tick.ly b/input/regression/bar-line-tick.ly index 9ddf246683..e0f7642dbc 100644 --- a/input/regression/bar-line-tick.ly +++ b/input/regression/bar-line-tick.ly @@ -2,7 +2,7 @@ \header { texidoc = "A ticked bar line is a short line of the same length as a staff space, centered on the top-most barline." } -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 82bfb1581d..1711e9a9ad 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index d7b3c5d498..263cbe374d 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index 5075ee6bd5..c607d4e1fd 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly index 0bdc747c26..213031bb4d 100644 --- a/input/regression/beam-auto.ly +++ b/input/regression/beam-auto.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "@cindex Beaming Presets There are presets for the @code{auto-beam} engraver in the case of common diff --git a/input/regression/beam-beamlet-break.ly b/input/regression/beam-beamlet-break.ly index 0468a4e70e..fd29e25909 100644 --- a/input/regression/beam-beamlet-break.ly +++ b/input/regression/beam-beamlet-break.ly @@ -3,7 +3,7 @@ beamlets on the same height." } -\version "2.11.51" +\version "2.12.0" \paper { raggedright = ##t diff --git a/input/regression/beam-beamlet-grace.ly b/input/regression/beam-beamlet-grace.ly index 6a6e2b841b..7c899f343b 100644 --- a/input/regression/beam-beamlet-grace.ly +++ b/input/regression/beam-beamlet-grace.ly @@ -3,7 +3,7 @@ texidoc = "Beamlets in grace notes remain readable." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/beam-beat-grouping.ly b/input/regression/beam-beat-grouping.ly index a9c22a4477..e3af9219b5 100644 --- a/input/regression/beam-beat-grouping.ly +++ b/input/regression/beam-beat-grouping.ly @@ -6,7 +6,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { diff --git a/input/regression/beam-break-no-bar.ly b/input/regression/beam-break-no-bar.ly index 80106ea96d..c249e18152 100644 --- a/input/regression/beam-break-no-bar.ly +++ b/input/regression/beam-break-no-bar.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff \with { \remove Bar_engraver diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index 5b36f57f45..fffd0c4ff9 100644 --- a/input/regression/beam-break.ly +++ b/input/regression/beam-break.ly @@ -4,7 +4,7 @@ " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } \relative c'' { diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 1634751373..6d202523f4 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Simple beams on middle staffline are allowed to be diff --git a/input/regression/beam-concave-chord.ly b/input/regression/beam-concave-chord.ly index 3dfb402fee..14e6790832 100644 --- a/input/regression/beam-concave-chord.ly +++ b/input/regression/beam-concave-chord.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" morgenliedBeam = \relative c'' \new Voice{ diff --git a/input/regression/beam-concave-damped.ly b/input/regression/beam-concave-damped.ly index 9c59b0a7cd..135995d63f 100644 --- a/input/regression/beam-concave-damped.ly +++ b/input/regression/beam-concave-damped.ly @@ -2,7 +2,7 @@ texidoc = "Beams that are not strictly concave are damped according to their concaveness. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 5d15aa480e..093f30d918 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Fully concave beams should be horizontal. Informally spoken, diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index bab2d49ab3..3c9b1650fa 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/beam-cross-staff-script.ly b/input/regression/beam-cross-staff-script.ly index 620448b55b..772075495b 100644 --- a/input/regression/beam-cross-staff-script.ly +++ b/input/regression/beam-cross-staff-script.ly @@ -7,7 +7,7 @@ staves." } -\version "2.11.51" +\version "2.12.0" \new PianoStaff << \new Staff = RH { diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index ee6a3c078d..61be2c5242 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Cross staff (kneed) beams do not cause extreme slopes." } diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 52bb8d987d..0b711c7453 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Beams can be typeset over fixed distance aligned staves, beam diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index 38568cab40..2feffff8cc 100644 --- a/input/regression/beam-damp.ly +++ b/input/regression/beam-damp.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "@cindex Beam Damp Beams are less steep than the notes they encompass. " } \layout{ diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index 0313246295..42a9350464 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -1,6 +1,6 @@ \layout{ ragged-right = ##t} -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example." diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index d3a8e53bd2..61462dd7b8 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. diff --git a/input/regression/beam-feather-knee-stem-length.ly b/input/regression/beam-feather-knee-stem-length.ly index 56242f4bdc..58b602c149 100644 --- a/input/regression/beam-feather-knee-stem-length.ly +++ b/input/regression/beam-feather-knee-stem-length.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc="In feathered beams, stems in knees reach up to the feathered part correctly. diff --git a/input/regression/beam-feather.ly b/input/regression/beam-feather.ly index 18f81907c0..cf40c01aaa 100644 --- a/input/regression/beam-feather.ly +++ b/input/regression/beam-feather.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/beam-flat-retain-direction.ly b/input/regression/beam-flat-retain-direction.ly index 3197bdbaf5..01fcc2deda 100644 --- a/input/regression/beam-flat-retain-direction.ly +++ b/input/regression/beam-flat-retain-direction.ly @@ -3,7 +3,7 @@ texidoc = "Even very flat but slanted patterns should give slanted beams. " } -\version "2.11.51" +\version "2.12.0" \layout{ line-width = 15\cm debug-beam-scoring = ##t diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index 1f3c60c9c4..14d33b001d 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In French style beaming, the stems do not go between beams." diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index ded6e257e8..356b0d0db5 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" Funky kneed beams with beamlets also work. The beamlets diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 3f5dd26ae0..6bff9fd2cb 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In complex configurations of knee beaming, according to diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly index 4f858a5220..0c26f0db97 100644 --- a/input/regression/beam-isknee.ly +++ b/input/regression/beam-isknee.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="@cindex Beam Isknee diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 55e0dbf8ce..1c8048e3d9 100644 --- a/input/regression/beam-knee-symmetry.ly +++ b/input/regression/beam-knee-symmetry.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Point-symmetric beams should receive the same diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 5c1f22bbda..768930adb0 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index b606578381..744c6632b3 100644 --- a/input/regression/beam-manual-beaming.ly +++ b/input/regression/beam-manual-beaming.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index 1aa01eb010..861fbd0bca 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Kneed beams (often happens with cross-staff beams) diff --git a/input/regression/beam-multiplicity-over-rests.ly b/input/regression/beam-multiplicity-over-rests.ly index b8bda7a767..ddf2cc147a 100644 --- a/input/regression/beam-multiplicity-over-rests.ly +++ b/input/regression/beam-multiplicity-over-rests.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a beam goes over a rest, there should not be any diff --git a/input/regression/beam-outside-beamlets.ly b/input/regression/beam-outside-beamlets.ly index 6647baebc2..358dc18948 100644 --- a/input/regression/beam-outside-beamlets.ly +++ b/input/regression/beam-outside-beamlets.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index dcb6c6969c..8a01631a98 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Explicit beams may cross barlines. " } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index 0b8af33de1..174a7dfe82 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Beams on ledgered notes should always reach the middle staff diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly index 9ba075dee4..33b37bd29a 100644 --- a/input/regression/beam-quant-standard.ly +++ b/input/regression/beam-quant-standard.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly index ee38515efa..e0c444697c 100644 --- a/input/regression/beam-quanting-32nd.ly +++ b/input/regression/beam-quanting-32nd.ly @@ -8,7 +8,7 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden' } -\version "2.11.51" +\version "2.12.0" \relative c''{ \time 3/8 diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 0337cc7d40..91f7d22393 100644 --- a/input/regression/beam-quanting-horizontal.ly +++ b/input/regression/beam-quanting-horizontal.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 807e6c0a9d..ac1d57819d 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= "Quarter notes may be beamed: the beam is halted momentarily." diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly index 8a5fbbc50e..e02f4bbaf0 100644 --- a/input/regression/beam-rest.ly +++ b/input/regression/beam-rest.ly @@ -3,7 +3,7 @@ texidoc = "The number of beams does not change on a rest." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 7c71959144..1971bd8fd1 100644 --- a/input/regression/beam-second.ly +++ b/input/regression/beam-second.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 5fee53bc38..6cd91987a3 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Beams in unnatural direction, have shortened stems, but do not look too short." diff --git a/input/regression/beam-single-stem.ly b/input/regression/beam-single-stem.ly index f4f2684f56..742e4f0e22 100644 --- a/input/regression/beam-single-stem.ly +++ b/input/regression/beam-single-stem.ly @@ -4,7 +4,7 @@ clip-edges is switched off automatically." } -\version "2.11.51" +\version "2.12.0" \relative c' { d16[] diff --git a/input/regression/beam-slope-stemlet.ly b/input/regression/beam-slope-stemlet.ly index f8dbbba021..002e3e9239 100644 --- a/input/regression/beam-slope-stemlet.ly +++ b/input/regression/beam-slope-stemlet.ly @@ -6,7 +6,7 @@ as invisible stems." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/beam-unconnected-beamlets.ly b/input/regression/beam-unconnected-beamlets.ly index 40d6a37665..f7477b4b71 100644 --- a/input/regression/beam-unconnected-beamlets.ly +++ b/input/regression/beam-unconnected-beamlets.ly @@ -6,7 +6,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { \override Stem #'max-beam-connect = #1 diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index ddc3cedf63..907edf10f4 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 652f03db41..d982b35b9f 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 8b26f6a463..d49f4153b5 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Beaming can be also given explicitly." } diff --git a/input/regression/bend-after.ly b/input/regression/bend-after.ly index 1f3a0a12ae..c3213befe0 100644 --- a/input/regression/bend-after.ly +++ b/input/regression/bend-after.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/bend-dot.ly b/input/regression/bend-dot.ly index 202d2b7b1b..0e1b239d8d 100644 --- a/input/regression/bend-dot.ly +++ b/input/regression/bend-dot.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Bends avoid dots, but only if necessary." } diff --git a/input/regression/bookparts.ly b/input/regression/bookparts.ly index 19cd2aa258..a814fb5e07 100644 --- a/input/regression/bookparts.ly +++ b/input/regression/bookparts.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "A book can be split into several parts with different paper settings, diff --git a/input/regression/break-alignment-anchor-alignment.ly b/input/regression/break-alignment-anchor-alignment.ly index 385838b50e..79a1237ac7 100644 --- a/input/regression/break-alignment-anchor-alignment.ly +++ b/input/regression/break-alignment-anchor-alignment.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The default callback for break-align-anchor in clefs and time/key diff --git a/input/regression/break-alignment-anchors.ly b/input/regression/break-alignment-anchors.ly index 9e237a5f57..1161967d8d 100644 --- a/input/regression/break-alignment-anchors.ly +++ b/input/regression/break-alignment-anchors.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The break-align-anchor property of a break-aligned grob gives diff --git a/input/regression/break.ly b/input/regression/break.ly index af83a3e134..afce0368a2 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly index e2b2892e03..3115d6a625 100644 --- a/input/regression/breathing-sign-ancient.ly +++ b/input/regression/breathing-sign-ancient.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index a5f4f39ad5..763529a44c 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Breathing signs are available in different tastes: commas (default), diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 35c5766443..163ea98ee9 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Property chordChanges: display chord names only when diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly index 42fc68a224..d72b975e68 100644 --- a/input/regression/chord-name-entry-11.ly +++ b/input/regression/chord-name-entry-11.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly index d32b90c478..e5e6dc826a 100644 --- a/input/regression/chord-name-entry.ly +++ b/input/regression/chord-name-entry.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 4b59dbb2c7..86dc2e5159 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The property @code{chordNameExceptions} can used diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index dd35364dcc..ac280c4043 100644 --- a/input/regression/chord-name-major7.ly +++ b/input/regression/chord-name-major7.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The layout of the major 7 can be tuned with @code{majorSevenSymbol}." diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly index 8133c3f470..a09642746e 100644 --- a/input/regression/chord-names-bass.ly +++ b/input/regression/chord-names-bass.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chord-names-languages.ly b/input/regression/chord-names-languages.ly index 9f2a921953..e446afa4fb 100644 --- a/input/regression/chord-names-languages.ly +++ b/input/regression/chord-names-languages.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 337d1f8a11..b95cde22f0 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Scripts can also be attached to chord elements." diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly index 523dedb916..883dbbea20 100644 --- a/input/regression/chord-tremolo-short.ly +++ b/input/regression/chord-tremolo-short.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. diff --git a/input/regression/chord-tremolo-single.ly b/input/regression/chord-tremolo-single.ly index 3058ae1b00..e55106c4ec 100644 --- a/input/regression/chord-tremolo-single.ly +++ b/input/regression/chord-tremolo-single.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Chord tremolos on a single note." diff --git a/input/regression/chord-tremolo-stem-direction.ly b/input/regression/chord-tremolo-stem-direction.ly index b42d0882dc..d385510ca7 100644 --- a/input/regression/chord-tremolo-stem-direction.ly +++ b/input/regression/chord-tremolo-stem-direction.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right = ##t } diff --git a/input/regression/chord-tremolo-whole.ly b/input/regression/chord-tremolo-whole.ly index d3c745f84f..8b2e27e182 100644 --- a/input/regression/chord-tremolo-whole.ly +++ b/input/regression/chord-tremolo-whole.ly @@ -3,7 +3,7 @@ notes." } -\version "2.11.51" +\version "2.12.0" \relative c'''{ \repeat tremolo 32{ g64 a } diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index ef3555f511..6f84eab5bd 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 076955544b..b5349a3cfc 100644 --- a/input/regression/chords-funky-ignatzek.ly +++ b/input/regression/chords-funky-ignatzek.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/chromatic-scales.ly b/input/regression/chromatic-scales.ly index ca206582e0..d0b0298731 100644 --- a/input/regression/chromatic-scales.ly +++ b/input/regression/chromatic-scales.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" \header{ texidoc="@code{staffLineLayoutFunction} is used to change the position of the notes. This sets @code{staffLineLayoutFunction} to @code{ly:pitch-semitones} to diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly index e626535a72..80b43a1fea 100644 --- a/input/regression/clef-oct.ly +++ b/input/regression/clef-oct.ly @@ -1,5 +1,5 @@ -\version "2.11.51" \header { +\version "2.12.0" \header { texidoc = "Octavation signs may be added to clefs. These octavation signs may be placed below or above (meaning an octave diff --git a/input/regression/clef-ottava.ly b/input/regression/clef-ottava.ly index ac904455e1..a277e253e5 100644 --- a/input/regression/clef-ottava.ly +++ b/input/regression/clef-ottava.ly @@ -5,7 +5,7 @@ but they don't confuse one another." } -\version "2.11.53" +\version "2.12.0" \layout { ragged-right = ##t} diff --git a/input/regression/clef-warn.ly b/input/regression/clef-warn.ly index 4e4965753f..5f3b410e9d 100644 --- a/input/regression/clef-warn.ly +++ b/input/regression/clef-warn.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" { \clef "foo" c4 diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index c00ddf5bc3..02c727d0b3 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/clip-systems.ly b/input/regression/clip-systems.ly index 7b06cf77f7..1bf7c926d1 100644 --- a/input/regression/clip-systems.ly +++ b/input/regression/clip-systems.ly @@ -19,7 +19,7 @@ The result will be files named } -\version "2.11.51" +\version "2.12.0" #(ly:set-option 'clip-systems) diff --git a/input/regression/cluster-break.ly b/input/regression/cluster-break.ly index a8aa1d3392..4e0cc405e7 100644 --- a/input/regression/cluster-break.ly +++ b/input/regression/cluster-break.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clusters behave well across line breaks." } diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index b42907dd3c..2b0d627b23 100644 --- a/input/regression/cluster-cross-staff.ly +++ b/input/regression/cluster-cross-staff.ly @@ -7,7 +7,7 @@ ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" \new PianoStaff << \new Staff = "up" { diff --git a/input/regression/cluster-single-note.ly b/input/regression/cluster-single-note.ly index 3d28cb21dd..b8f91cea5f 100644 --- a/input/regression/cluster-single-note.ly +++ b/input/regression/cluster-single-note.ly @@ -4,5 +4,5 @@ } -\version "2.11.51" +\version "2.12.0" \relative c' { \makeClusters } diff --git a/input/regression/cluster-style.ly b/input/regression/cluster-style.ly index ef67a41441..37dfcbb0e4 100644 --- a/input/regression/cluster-style.ly +++ b/input/regression/cluster-style.ly @@ -1,6 +1,6 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clusters behave well across line breaks." } diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 9b8cc4f04c..ae74c3bc76 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clusters are a device to denote that a complete range of notes is to be played." diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 470bb61e43..e6317fa4ec 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Single head notes may collide. " } diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly index 797ac91a1e..b77a116c10 100644 --- a/input/regression/collision-alignment.ly +++ b/input/regression/collision-alignment.ly @@ -7,7 +7,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative << \new Staff { diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly index c0a0699d4b..d882cde643 100644 --- a/input/regression/collision-dots-invert.ly +++ b/input/regression/collision-dots-invert.ly @@ -6,7 +6,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { << 2\\ { 4 4 } >> << { 2 } \\ { 4. 8 } >> diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly index fb7297fdd7..e684871811 100644 --- a/input/regression/collision-dots-move.ly +++ b/input/regression/collision-dots-move.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If dotted note heads must remain on the left side, diff --git a/input/regression/collision-dots-up-space-dotted.ly b/input/regression/collision-dots-up-space-dotted.ly index 6b0ada6cf2..272ea3578b 100644 --- a/input/regression/collision-dots-up-space-dotted.ly +++ b/input/regression/collision-dots-up-space-dotted.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t } diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index c603e3217f..264a3350d0 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -2,7 +2,7 @@ on the right side." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down) diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 79ba288240..248e674809 100644 --- a/input/regression/collision-head-chords.ly +++ b/input/regression/collision-head-chords.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Note heads in collisions should be merged if they have the same positions in the extreme note heads. diff --git a/input/regression/collision-head-solfa-fa.ly b/input/regression/collision-head-solfa-fa.ly index 143ea7e0e4..e6a3cf1b10 100644 --- a/input/regression/collision-head-solfa-fa.ly +++ b/input/regression/collision-head-solfa-fa.ly @@ -4,7 +4,7 @@ block-shaped note." } -\version "2.11.51" +\version "2.12.0" << \key c \major diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 575280459c..11387aecf3 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Open and black note heads are not merged by default." diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly index fa22c8fa69..7acb4befbc 100644 --- a/input/regression/collision-manual.ly +++ b/input/regression/collision-manual.ly @@ -2,7 +2,7 @@ texidoc = "Collision resolution may be forced manually with @code{force-hshift}. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index a682b171ac..77ea8e2877 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If @code{NoteCollision} has diff --git a/input/regression/collision-merge-differently-headed.ly b/input/regression/collision-merge-differently-headed.ly index 238064dda6..88ae8082c9 100644 --- a/input/regression/collision-merge-differently-headed.ly +++ b/input/regression/collision-merge-differently-headed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index 92c34b54ec..9b3b44697f 100644 --- a/input/regression/collision-merge-dots.ly +++ b/input/regression/collision-merge-dots.ly @@ -4,7 +4,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" { \relative c'' \new Staff { diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 7025b09f45..53b02aa4cb 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Oppositely stemmed chords, meshing into each other, are resolved." diff --git a/input/regression/collision-seconds.ly b/input/regression/collision-seconds.ly index 51f46f7559..2dd97fddc0 100644 --- a/input/regression/collision-seconds.ly +++ b/input/regression/collision-seconds.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Seconds do not confuse the collision algorithm too much. The best diff --git a/input/regression/collision-whole.ly b/input/regression/collision-whole.ly index bc9d07f255..20f0d71946 100644 --- a/input/regression/collision-whole.ly +++ b/input/regression/collision-whole.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Mixed collisions with whole notes require asymmetric shifts." diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index d33d4e579b..e3e6816325 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" In addition to normal collision rules, there is support for polyphony, diff --git a/input/regression/color.ly b/input/regression/color.ly index 8160a124d5..9f4f875292 100644 --- a/input/regression/color.ly +++ b/input/regression/color.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Each grob can have a color assigned to it. diff --git a/input/regression/completion-heads-lyrics.ly b/input/regression/completion-heads-lyrics.ly index 006fb0c19a..ff0801f8fe 100644 --- a/input/regression/completion-heads-lyrics.ly +++ b/input/regression/completion-heads-lyrics.ly @@ -1,7 +1,7 @@ \header { texidoc = "You can put lyrics under completion heads." } -\version "2.11.51" +\version "2.12.0" mel = \relative c'' { c1. c1. diff --git a/input/regression/completion-heads-multiple-ties.ly b/input/regression/completion-heads-multiple-ties.ly index 32b2dbc9a9..eb7948a35b 100644 --- a/input/regression/completion-heads-multiple-ties.ly +++ b/input/regression/completion-heads-multiple-ties.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index b4c0e7c172..e275aa9e12 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Completion heads are broken across bar lines. This was diff --git a/input/regression/completion-heads-tie.ly b/input/regression/completion-heads-tie.ly index 38471c1e66..8bd6028aa1 100644 --- a/input/regression/completion-heads-tie.ly +++ b/input/regression/completion-heads-tie.ly @@ -5,7 +5,7 @@ } -\version "2.11.58" +\version "2.12.0" \paper{ ragged-right=##t } diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index ad2c64435e..708dc0fb4a 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/context-die-staff.ly b/input/regression/context-die-staff.ly index 6ac2d8ab23..14ad542784 100644 --- a/input/regression/context-die-staff.ly +++ b/input/regression/context-die-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "a staff should die if there is reference to it." diff --git a/input/regression/context-nested-staffgroup.ly b/input/regression/context-nested-staffgroup.ly index bea556e623..c22007fe51 100644 --- a/input/regression/context-nested-staffgroup.ly +++ b/input/regression/context-nested-staffgroup.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Contexts of the same type can be nested." } diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 64b42e3021..8520260739 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Custodes may be engraved in various styles." } diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 41554fa25b..f8e49a1cb3 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(use-modules (srfi srfi-13) (ice-9 format)) diff --git a/input/regression/dot-column-rest-collision.ly b/input/regression/dot-column-rest-collision.ly index 5a8019422e..95f0db9aeb 100644 --- a/input/regression/dot-column-rest-collision.ly +++ b/input/regression/dot-column-rest-collision.ly @@ -2,7 +2,7 @@ texidoc = "Dot columns do not trigger beam slanting too early." } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t } << { e''8 e''8 g'' g''} \\ diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index a2c6a41606..2c51af61e5 100644 --- a/input/regression/dot-flag-collision.ly +++ b/input/regression/dot-flag-collision.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Dots move to the right when a collision with the (up)flag happens." } diff --git a/input/regression/dot-rest-beam-trigger.ly b/input/regression/dot-rest-beam-trigger.ly index 3714cf7a82..cae9b796a6 100644 --- a/input/regression/dot-rest-beam-trigger.ly +++ b/input/regression/dot-rest-beam-trigger.ly @@ -6,7 +6,7 @@ } -\version "2.11.54" +\version "2.12.0" \new Staff \relative c'' { << diff --git a/input/regression/dot-up-voice-collision.ly b/input/regression/dot-up-voice-collision.ly index 3329140260..a18dac6a32 100644 --- a/input/regression/dot-up-voice-collision.ly +++ b/input/regression/dot-up-voice-collision.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/dots.ly b/input/regression/dots.ly index 774022819f..a82d7f4d1e 100644 --- a/input/regression/dots.ly +++ b/input/regression/dots.ly @@ -1,4 +1,4 @@ -\version "2.11.51" \header{ +\version "2.12.0" \header{ texidoc=" Both noteheads and rests can have dots. diff --git a/input/regression/double-repeat-default-volta.ly b/input/regression/double-repeat-default-volta.ly index b095b3c501..d1a8086c47 100644 --- a/input/regression/double-repeat-default-volta.ly +++ b/input/regression/double-repeat-default-volta.ly @@ -1,4 +1,4 @@ -\version "2.11.60" +\version "2.12.0" \header { texidoc = "For volte, the style of double repeats can be set diff --git a/input/regression/double-repeat.ly b/input/regression/double-repeat.ly index 5c2f697279..825dfd84cf 100644 --- a/input/regression/double-repeat.ly +++ b/input/regression/double-repeat.ly @@ -1,4 +1,4 @@ -\version "2.11.60" +\version "2.12.0" \header { texidoc = "Three types of double repeat bar line are supported." diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 519b982367..ddc05e4d5a 100644 --- a/input/regression/drums.ly +++ b/input/regression/drums.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 9466d255fa..d4dde92492 100644 --- a/input/regression/dynamics-broken-hairpin.ly +++ b/input/regression/dynamics-broken-hairpin.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Broken crescendi should be open on one side." } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 56dad3dac3..6a58b087de 100644 --- a/input/regression/dynamics-glyphs.ly +++ b/input/regression/dynamics-glyphs.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header {texidoc = "Dynamic letters are kerned, and their weight matches that of the hairpin signs. The dynamic scripts should be diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly index 91efabfc9d..30dd6d78f3 100644 --- a/input/regression/dynamics-hairpin-length.ly +++ b/input/regression/dynamics-hairpin-length.ly @@ -6,7 +6,7 @@ respectively." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 5a299e0fed..e263d925c5 100644 --- a/input/regression/dynamics-line.ly +++ b/input/regression/dynamics-line.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Dynamics appear below or above the staff. If multiple dynamics are linked with (de)crescendi, they should be on the same diff --git a/input/regression/dynamics-text-spanner-abs-dynamic.ly b/input/regression/dynamics-text-spanner-abs-dynamic.ly index 0041a173d1..9136370790 100644 --- a/input/regression/dynamics-text-spanner-abs-dynamic.ly +++ b/input/regression/dynamics-text-spanner-abs-dynamic.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative c' { diff --git a/input/regression/dynamics-text-spanner-padding.ly b/input/regression/dynamics-text-spanner-padding.ly index 6bc3ac1467..1afe18bbc6 100644 --- a/input/regression/dynamics-text-spanner-padding.ly +++ b/input/regression/dynamics-text-spanner-padding.ly @@ -4,7 +4,7 @@ from the notes. " } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0.0\mm diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index 0f8ecf6ea8..9b2eed583b 100644 --- a/input/regression/dynamics-unbound-hairpin.ly +++ b/input/regression/dynamics-unbound-hairpin.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Crescendi may start off-notes, however, they should not collapse into flat lines." diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly index 381589b4bb..908e54f0e0 100644 --- a/input/regression/easy-notation.ly +++ b/input/regression/easy-notation.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " Easy-notation (or Ez-notation) prints names in note heads. diff --git a/input/regression/fermata-rest-position.ly b/input/regression/fermata-rest-position.ly index b7a1c4738b..dd49b82a55 100644 --- a/input/regression/fermata-rest-position.ly +++ b/input/regression/fermata-rest-position.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " Fermatas over multimeasure rests are positioned as over normal rests. diff --git a/input/regression/figured-bass-alteration.ly b/input/regression/figured-bass-alteration.ly index c6c20f76c3..c2bfb93c3f 100644 --- a/input/regression/figured-bass-alteration.ly +++ b/input/regression/figured-bass-alteration.ly @@ -3,7 +3,7 @@ texidoc = "Bass figures can carry alterations." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t diff --git a/input/regression/figured-bass-continuation-center.ly b/input/regression/figured-bass-continuation-center.ly index 3d967fabd0..d354ff691a 100644 --- a/input/regression/figured-bass-continuation-center.ly +++ b/input/regression/figured-bass-continuation-center.ly @@ -6,7 +6,7 @@ true." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/figured-bass-continuation-forbid.ly b/input/regression/figured-bass-continuation-forbid.ly index 9bd63398f8..d369a07e83 100644 --- a/input/regression/figured-bass-continuation-forbid.ly +++ b/input/regression/figured-bass-continuation-forbid.ly @@ -4,7 +4,7 @@ may be forbidden. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \figures { diff --git a/input/regression/figured-bass-continuation-modifiers.ly b/input/regression/figured-bass-continuation-modifiers.ly index fd576aa085..b58615c8d5 100644 --- a/input/regression/figured-bass-continuation-modifiers.ly +++ b/input/regression/figured-bass-continuation-modifiers.ly @@ -5,7 +5,7 @@ } -\version "2.11.64" +\version "2.12.0" << \relative \new Voice { diff --git a/input/regression/figured-bass-continuation.ly b/input/regression/figured-bass-continuation.ly index 0e0e9d1d5f..e939a6f07c 100644 --- a/input/regression/figured-bass-continuation.ly +++ b/input/regression/figured-bass-continuation.ly @@ -5,7 +5,7 @@ figures. They are switched on with @code{useBassFigureExtenders}" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/figured-bass-implicit.ly b/input/regression/figured-bass-implicit.ly index bc6bba8c83..fc4823aa17 100644 --- a/input/regression/figured-bass-implicit.ly +++ b/input/regression/figured-bass-implicit.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/figured-bass-slashed-numbers.ly b/input/regression/figured-bass-slashed-numbers.ly index 993b56a00e..0289c3e9a2 100644 --- a/input/regression/figured-bass-slashed-numbers.ly +++ b/input/regression/figured-bass-slashed-numbers.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" bassfigures = \figuremode { <0/ 1/ 2/> <3/ 4/ 5/> <6/ 7/ 8/> <9/ 10/ 11/> <12/ 13/ 100/> diff --git a/input/regression/figured-bass-staff.ly b/input/regression/figured-bass-staff.ly index 2c9a04e2dc..02dd09f080 100644 --- a/input/regression/figured-bass-staff.ly +++ b/input/regression/figured-bass-staff.ly @@ -3,7 +3,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index f4fd4c5340..cbcb40c96f 100644 --- a/input/regression/figured-bass.ly +++ b/input/regression/figured-bass.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly index a083344675..beb9ce9bb7 100644 --- a/input/regression/fill-line-test.ly +++ b/input/regression/fill-line-test.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/finger-chords-accidental.ly b/input/regression/finger-chords-accidental.ly index 19ec24abd1..6d6310ec07 100644 --- a/input/regression/finger-chords-accidental.ly +++ b/input/regression/finger-chords-accidental.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Scripts left of a chord avoid accidentals." diff --git a/input/regression/finger-chords-order.ly b/input/regression/finger-chords-order.ly index cb929996e1..a216d3d9d9 100644 --- a/input/regression/finger-chords-order.ly +++ b/input/regression/finger-chords-order.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 16c56bb67a..abb0fb2783 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "It is possible to associate diff --git a/input/regression/fingering-cross-staff.ly b/input/regression/fingering-cross-staff.ly index a6f987b490..7a2a310e41 100644 --- a/input/regression/fingering-cross-staff.ly +++ b/input/regression/fingering-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Fingerings work correctly with cross-staff beams." diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index ccaaff0bc7..383ebe060b 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Automatic fingering tries to put fingering instructions diff --git a/input/regression/flags-default.ly b/input/regression/flags-default.ly index e6d65bd3b7..ebcfc115af 100644 --- a/input/regression/flags-default.ly +++ b/input/regression/flags-default.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" #(set-global-staff-size 17) \header { diff --git a/input/regression/flags-in-scheme.ly b/input/regression/flags-in-scheme.ly index 637f210866..1ee3d1c3cc 100644 --- a/input/regression/flags-in-scheme.ly +++ b/input/regression/flags-in-scheme.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "The 'flag property of the Stem grob can be set to a custom diff --git a/input/regression/flags-straight-stockhausen-boulez.ly b/input/regression/flags-straight-stockhausen-boulez.ly index bf164a967f..49008ee3b1 100644 --- a/input/regression/flags-straight-stockhausen-boulez.ly +++ b/input/regression/flags-straight-stockhausen-boulez.ly @@ -1,4 +1,4 @@ -\version "2.11.49" +\version "2.12.0" stemLength = #(define-music-function (parser location length) (number?) "Set the length of the next stem explicitly." diff --git a/input/regression/flags-straight.ly b/input/regression/flags-straight.ly index 6f359662be..171902ba6a 100644 --- a/input/regression/flags-straight.ly +++ b/input/regression/flags-straight.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Straight flag styles." diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index b7069fe85d..5c7b10a017 100644 --- a/input/regression/follow-voice-break.ly +++ b/input/regression/follow-voice-break.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = " The line-spanners connects to the Y position of the note on the next line. diff --git a/input/regression/follow-voice-consecutive.ly b/input/regression/follow-voice-consecutive.ly index bb6e58b2d8..2a52080bbe 100644 --- a/input/regression/follow-voice-consecutive.ly +++ b/input/regression/follow-voice-consecutive.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= "The voice follower is not confused when set for consecutive diff --git a/input/regression/font-bogus-ligature.ly b/input/regression/font-bogus-ligature.ly index 01fd584690..b5abe6ccb5 100644 --- a/input/regression/font-bogus-ligature.ly +++ b/input/regression/font-bogus-ligature.ly @@ -5,7 +5,7 @@ This may happen with incorrect font versions. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T diff --git a/input/regression/font-family-override.ly b/input/regression/font-family-override.ly index bad03f75ee..39c9b6849a 100644 --- a/input/regression/font-family-override.ly +++ b/input/regression/font-family-override.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { % change for other default global staff size. diff --git a/input/regression/font-kern.ly b/input/regression/font-kern.ly index ba1dc789b5..0e9f887721 100644 --- a/input/regression/font-kern.ly +++ b/input/regression/font-kern.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Text set in TrueType Fonts that contain kerning tables, are kerned. " diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 1d9d988282..062f2f7549 100644 --- a/input/regression/font-name.ly +++ b/input/regression/font-name.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly index d061343bfa..71517886c2 100644 --- a/input/regression/font-postscript.ly +++ b/input/regression/font-postscript.ly @@ -4,7 +4,7 @@ fonts. The file @file{font.scm} shows how to define the scheme-function @code{make-century-schoolbook-tree}." } -\version "2.11.51" +\version "2.12.0" \paper { #(define text-font-defaults diff --git a/input/regression/fret-boards.ly b/input/regression/fret-boards.ly index b61e480b27..c99f27d474 100644 --- a/input/regression/fret-boards.ly +++ b/input/regression/fret-boards.ly @@ -6,7 +6,7 @@ best when one string number is indicated in advance " } -\version "2.11.51" +\version "2.12.0" foo = \relative c { _\markup { diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly index e154377670..7e424b5d61 100644 --- a/input/regression/fret-diagrams.ly +++ b/input/regression/fret-diagrams.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/general-scheme-bindings.ly b/input/regression/general-scheme-bindings.ly index 1d9329c0df..27e8c874b1 100644 --- a/input/regression/general-scheme-bindings.ly +++ b/input/regression/general-scheme-bindings.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" %% todo : use macro, to show the statement tested. #(ly:progress "~a\n" (ly:expand-environment "${HOME} $HOME $$ ")) diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly index 10c71d7024..da8c41ff39 100644 --- a/input/regression/generic-output-property.ly +++ b/input/regression/generic-output-property.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/glissando-broken.ly b/input/regression/glissando-broken.ly index fa29a4a242..4234a68bb7 100644 --- a/input/regression/glissando-broken.ly +++ b/input/regression/glissando-broken.ly @@ -2,7 +2,7 @@ texidoc = "If broken, Glissandi anticipate on the pitch of the next line." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/glissando-no-break.ly b/input/regression/glissando-no-break.ly index 4c0122f97a..2d22b57359 100644 --- a/input/regression/glissando-no-break.ly +++ b/input/regression/glissando-no-break.ly @@ -4,7 +4,7 @@ Use @code{breakable} grob property to override." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index a878601a92..fb780e1d27 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index d38e90e61c..a187226420 100644 --- a/input/regression/grace-auto-beam.ly +++ b/input/regression/grace-auto-beam.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The autobeamer is not confused by grace notes." diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 505ebea180..0cf52ae3c7 100644 --- a/input/regression/grace-bar-line.ly +++ b/input/regression/grace-bar-line.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Bar line should come before the grace note." } diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly index d000a0303d..c1771d8739 100644 --- a/input/regression/grace-bar-number.ly +++ b/input/regression/grace-bar-number.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace notes do tricky things with timing. If a measure diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index 7f171b4393..9089d64dd0 100644 --- a/input/regression/grace-beam.ly +++ b/input/regression/grace-beam.ly @@ -9,7 +9,7 @@ Unbeamed grace notes are not put into normal beams. \layout { ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { c4 d8[ \grace { e32[ d c d] } e8] diff --git a/input/regression/grace-direction-polyphony.ly b/input/regression/grace-direction-polyphony.ly index 7717b5932c..bc364f105e 100644 --- a/input/regression/grace-direction-polyphony.ly +++ b/input/regression/grace-direction-polyphony.ly @@ -4,7 +4,7 @@ finishing the grace section." } -\version "2.11.51" +\version "2.12.0" \relative c''' { \voiceOne diff --git a/input/regression/grace-end-2.ly b/input/regression/grace-end-2.ly index 954eaec206..88ba608824 100644 --- a/input/regression/grace-end-2.ly +++ b/input/regression/grace-end-2.ly @@ -3,6 +3,6 @@ texidoc = "Grace notes at the end of an expression don't cause crashes." } -\version "2.11.51" +\version "2.12.0" { e' \acciaccatura << e'8 \\ cis' >> } diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index 47b2b117e4..1155d98921 100644 --- a/input/regression/grace-end.ly +++ b/input/regression/grace-end.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc="@cindex Grace End diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 4d8f9e6c39..35f97d56d4 100644 --- a/input/regression/grace-nest1.ly +++ b/input/regression/grace-nest1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace code should not be confused by nested sequential music containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly index 8229547176..3c1bba2567 100644 --- a/input/regression/grace-nest2.ly +++ b/input/regression/grace-nest2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace code should not be confused by nested sequential music containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index e97c054ba3..61d2e2852a 100644 --- a/input/regression/grace-nest3.ly +++ b/input/regression/grace-nest3.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In nested syntax, graces are still properly handled." } diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index b8bcb3d56c..cec7d109c8 100644 --- a/input/regression/grace-nest4.ly +++ b/input/regression/grace-nest4.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Also in the nested syntax here, grace notes appear rightly." } diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly index ca64d9c1d6..2d0baac2ca 100644 --- a/input/regression/grace-nest5.ly +++ b/input/regression/grace-nest5.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Graces notes may have the same duration as the main note." } diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly index 148a2a77f5..fe04f094fa 100644 --- a/input/regression/grace-part-combine.ly +++ b/input/regression/grace-part-combine.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace notes may be put in a @code{partcombine}r." } diff --git a/input/regression/grace-partial.ly b/input/regression/grace-partial.ly index 6897e88f86..69b4f9ad70 100644 --- a/input/regression/grace-partial.ly +++ b/input/regression/grace-partial.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 1b85382075..319cac2240 100644 --- a/input/regression/grace-staff-length.ly +++ b/input/regression/grace-staff-length.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Stripped version of trip.ly. Staves should be of correct length." } diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly index de069decb4..d8838b2b1b 100644 --- a/input/regression/grace-start.ly +++ b/input/regression/grace-start.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Pieces may begin with grace notes." } diff --git a/input/regression/grace-stem-length.ly b/input/regression/grace-stem-length.ly index bb3eee7821..d4c831f6cf 100644 --- a/input/regression/grace-stem-length.ly +++ b/input/regression/grace-stem-length.ly @@ -3,7 +3,7 @@ normal notes, if possible. They should never be longer, even if that would lead to beam quanting problems." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 249230e721..43eab6278b 100644 --- a/input/regression/grace-stems.ly +++ b/input/regression/grace-stems.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to true; the two grace beams should be the same here. diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index d7388bded5..13d96ffb79 100644 --- a/input/regression/grace-sync.ly +++ b/input/regression/grace-sync.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Grace notes in different voices/staves are synchronized." } diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly index 59bdb4c990..0885a04fc9 100644 --- a/input/regression/grace-types.ly +++ b/input/regression/grace-types.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "There are three different kinds of grace types: the base grace switches to smaller type, the appoggiatura inserts also a slur, and the diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index ea9a5ae4d9..c2df025858 100644 --- a/input/regression/grace-unfold-repeat.ly +++ b/input/regression/grace-unfold-repeat.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When grace notes are entered with unfolded repeats, line breaks take place before grace notes. diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly index 098e9f79b6..1df9fec9c4 100644 --- a/input/regression/grace-volta-repeat-2.ly +++ b/input/regression/grace-volta-repeat-2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 4730417f9d..a24e2e1538 100644 --- a/input/regression/grace-volta-repeat.ly +++ b/input/regression/grace-volta-repeat.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 408c8fdc05..36462f342c 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/graphviz.ly b/input/regression/graphviz.ly index 850d1a324b..3687d3dc74 100644 --- a/input/regression/graphviz.ly +++ b/input/regression/graphviz.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \include "graphviz-init.ly" #(whitelist-grob 'NoteHead) diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly index 3be4bb37bb..8a99130511 100644 --- a/input/regression/grid-lines.ly +++ b/input/regression/grid-lines.ly @@ -5,7 +5,7 @@ staves synchronized with the notes." } -\version "2.11.51" +\version "2.12.0" skips = { diff --git a/input/regression/grob-tweak.ly b/input/regression/grob-tweak.ly index 6622eb4265..ae4f1deffc 100644 --- a/input/regression/grob-tweak.ly +++ b/input/regression/grob-tweak.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/hairpin-barline-break.ly b/input/regression/hairpin-barline-break.ly index 139c72ac7c..88973d0bee 100644 --- a/input/regression/hairpin-barline-break.ly +++ b/input/regression/hairpin-barline-break.ly @@ -5,7 +5,7 @@ do not print that ending. But on the previous line, this hairpin should not be left open, and should end at the bar line. " } -\version "2.11.51" +\version "2.12.0" \relative c' { c1\> diff --git a/input/regression/hairpin-circled.ly b/input/regression/hairpin-circled.ly index ed75eb3a43..e01f244d75 100644 --- a/input/regression/hairpin-circled.ly +++ b/input/regression/hairpin-circled.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly index b921d33d68..0607b291e2 100644 --- a/input/regression/hairpin-dashed.ly +++ b/input/regression/hairpin-dashed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Hairpin crescendi may be dashed. " diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index 9004508262..a5e33c426c 100644 --- a/input/regression/hairpin-ending.ly +++ b/input/regression/hairpin-ending.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/hairpin-to-barline-mark.ly b/input/regression/hairpin-to-barline-mark.ly index 1933641b2b..c6d10938e7 100644 --- a/input/regression/hairpin-to-barline-mark.ly +++ b/input/regression/hairpin-to-barline-mark.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/hairpin-to-barline.ly b/input/regression/hairpin-to-barline.ly index ea7d85298d..2a0a9db357 100644 --- a/input/regression/hairpin-to-barline.ly +++ b/input/regression/hairpin-to-barline.ly @@ -5,7 +5,7 @@ should end at that bar line. " } -\version "2.11.51" +\version "2.12.0" \relative c'' { \override Hairpin #'bound-padding = #1.0 diff --git a/input/regression/hairpin-to-rest.ly b/input/regression/hairpin-to-rest.ly index def7001b4f..1f5d4800a7 100644 --- a/input/regression/hairpin-to-rest.ly +++ b/input/regression/hairpin-to-rest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Hairpins end at the left edge of a rest." } diff --git a/input/regression/hara-kiri-percent-repeat.ly b/input/regression/hara-kiri-percent-repeat.ly index 0beb255491..d1ce10f1cd 100644 --- a/input/regression/hara-kiri-percent-repeat.ly +++ b/input/regression/hara-kiri-percent-repeat.ly @@ -2,7 +2,7 @@ texidoc = "Staves with percent repeats are not killed." } -\version "2.11.53" +\version "2.12.0" << \new Staff { c''1 c'' \break c'' c'' } diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index ebc783ee24..e347ad2029 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = diff --git a/input/regression/hara-kiri-stanza-number.ly b/input/regression/hara-kiri-stanza-number.ly index c1187c7400..18386a8cdd 100644 --- a/input/regression/hara-kiri-stanza-number.ly +++ b/input/regression/hara-kiri-stanza-number.ly @@ -11,7 +11,7 @@ lines." ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" << \new Voice = melody \relative c'{ diff --git a/input/regression/harp-pedals-sanity-checks.ly b/input/regression/harp-pedals-sanity-checks.ly index f395f0dac6..38c4f45089 100644 --- a/input/regression/harp-pedals-sanity-checks.ly +++ b/input/regression/harp-pedals-sanity-checks.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "The harp-pedal markup function does some sanity checks. All diff --git a/input/regression/harp-pedals-tweaking.ly b/input/regression/harp-pedals-tweaking.ly index 87d0f0f4e3..ad3f95552a 100644 --- a/input/regression/harp-pedals-tweaking.ly +++ b/input/regression/harp-pedals-tweaking.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Harp pedals can be tweaked through the size, thickness and diff --git a/input/regression/harp-pedals.ly b/input/regression/harp-pedals.ly index 04af5a5271..7f19767e21 100644 --- a/input/regression/harp-pedals.ly +++ b/input/regression/harp-pedals.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Basic harp diagram functionality, including circled pedal boxes. diff --git a/input/regression/horizontal-bracket-break.ly b/input/regression/horizontal-bracket-break.ly index 6e88244b9a..c0ff49d0d5 100644 --- a/input/regression/horizontal-bracket-break.ly +++ b/input/regression/horizontal-bracket-break.ly @@ -2,7 +2,7 @@ texidoc = "Horizontal brackets connect over line breaks." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \new Voice \with { diff --git a/input/regression/horizontal-bracket.ly b/input/regression/horizontal-bracket.ly index bcbe3a9db3..ae9a48c66c 100644 --- a/input/regression/horizontal-bracket.ly +++ b/input/regression/horizontal-bracket.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/identifier-following-chordmode.ly b/input/regression/identifier-following-chordmode.ly index c635af1737..34dec04102 100644 --- a/input/regression/identifier-following-chordmode.ly +++ b/input/regression/identifier-following-chordmode.ly @@ -7,7 +7,7 @@ modifier." } -\version "2.11.55" +\version "2.12.0" myDisplayMusic = #(define-music-function (parser location music) diff --git a/input/regression/identifiers.ly b/input/regression/identifiers.ly index 9506769914..a201349411 100644 --- a/input/regression/identifiers.ly +++ b/input/regression/identifiers.ly @@ -2,7 +2,7 @@ \header { texidoc = "test identifiers." } -\version "2.11.51" +\version "2.12.0" num = #3 mus = { c'4 } diff --git a/input/regression/incipit.ly b/input/regression/incipit.ly index f936ba779c..31d9e6f252 100644 --- a/input/regression/incipit.ly +++ b/input/regression/incipit.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" %% to avoid warnings: #(set-object-property! 'music 'backend-type? ly:music?) diff --git a/input/regression/instrument-name-dynamic.ly b/input/regression/instrument-name-dynamic.ly index 63c0cb5f52..f7faa7e09d 100644 --- a/input/regression/instrument-name-dynamic.ly +++ b/input/regression/instrument-name-dynamic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/instrument-name-hara-kiri.ly b/input/regression/instrument-name-hara-kiri.ly index 2f4e98fb9a..55b209d349 100644 --- a/input/regression/instrument-name-hara-kiri.ly +++ b/input/regression/instrument-name-hara-kiri.ly @@ -9,7 +9,7 @@ as does the instrument name. " } -\version "2.11.51" +\version "2.12.0" \new PianoStaff << \new Staff { diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index 7d1655a518..3af4924721 100644 --- a/input/regression/instrument-name-markup.ly +++ b/input/regression/instrument-name-markup.ly @@ -9,7 +9,7 @@ including alterations. " \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" textFlat = \markup {\smaller \flat} diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly index 632842ea47..87ad6f4dfd 100644 --- a/input/regression/instrument-name-partial.ly +++ b/input/regression/instrument-name-partial.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Instrument names are also printed on partial starting measures." } diff --git a/input/regression/instrument-name-x-align.ly b/input/regression/instrument-name-x-align.ly index c44f507ab0..190807c950 100644 --- a/input/regression/instrument-name-x-align.ly +++ b/input/regression/instrument-name-x-align.ly @@ -8,7 +8,7 @@ the following systems, respectively." } -\version "2.11.57" +\version "2.12.0" \paper { left-margin = 3\cm } \score { \new StaffGroup << diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index c48478f877..121dd42087 100644 --- a/input/regression/instrument-name.ly +++ b/input/regression/instrument-name.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Staff margins are also markings attached to barlines. They should be diff --git a/input/regression/instrument-switch.ly b/input/regression/instrument-switch.ly index d3d5d30c1a..81235e297a 100644 --- a/input/regression/instrument-switch.ly +++ b/input/regression/instrument-switch.ly @@ -5,7 +5,7 @@ properties for an in staff instrument switch. " } -\version "2.11.51" +\version "2.12.0" \addInstrumentDefinition #"bassClar" #`((instrumentTransposition . ,(ly:make-pitch -1 6 FLAT)) (instrumentName . "bla") diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index ca50f5beb6..761f062710 100644 --- a/input/regression/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Each clef has its own accidental placing rules. "} diff --git a/input/regression/key-signature-cancellation-extra-natural.ly b/input/regression/key-signature-cancellation-extra-natural.ly index 1b71b803a5..676e1dc2ef 100644 --- a/input/regression/key-signature-cancellation-extra-natural.ly +++ b/input/regression/key-signature-cancellation-extra-natural.ly @@ -6,7 +6,7 @@ signature are cancelled." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly index af13a67cfc..8193110ff4 100644 --- a/input/regression/key-signature-cancellation.ly +++ b/input/regression/key-signature-cancellation.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/key-signature-padding.ly b/input/regression/key-signature-padding.ly index ca55f36f6a..a27bde7cff 100644 --- a/input/regression/key-signature-padding.ly +++ b/input/regression/key-signature-padding.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" { \override Staff.KeySignature #'padding-pairs diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index ec05e54cd3..93710c2c70 100644 --- a/input/regression/key-signature-scordatura.ly +++ b/input/regression/key-signature-scordatura.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By setting @code{Staff.keySignature} directly, key signatures can be set invidually per pitch. diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 6c72aa6268..0a3fb7e8a5 100644 --- a/input/regression/keys.ly +++ b/input/regression/keys.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Key signatures may appear on key changes, even without a barline. diff --git a/input/regression/laissez-vibrer-tie-beam.ly b/input/regression/laissez-vibrer-tie-beam.ly index 3f68a47329..840f5b28f8 100644 --- a/input/regression/laissez-vibrer-tie-beam.ly +++ b/input/regression/laissez-vibrer-tie-beam.ly @@ -5,7 +5,7 @@ premature beam slope calculation. " } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t diff --git a/input/regression/laissez-vibrer-ties.ly b/input/regression/laissez-vibrer-ties.ly index f1b1ba655a..934bf27091 100644 --- a/input/regression/laissez-vibrer-ties.ly +++ b/input/regression/laissez-vibrer-ties.ly @@ -10,7 +10,7 @@ They have fixed size. Their formatting can be tuned with " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/landscape.ly b/input/regression/landscape.ly index ec339cd6e2..beea8e9dd2 100644 --- a/input/regression/landscape.ly +++ b/input/regression/landscape.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6" 'landscape) \header { texidoc = " Scores may be printed in landcape mode."} diff --git a/input/regression/ledger-line-minimum.ly b/input/regression/ledger-line-minimum.ly index 78ce5a9a9b..471818e9d2 100644 --- a/input/regression/ledger-line-minimum.ly +++ b/input/regression/ledger-line-minimum.ly @@ -7,7 +7,7 @@ disappearing." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t} \relative c'' { \time 2/4 diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly index 822d72ad20..04ec6a9f95 100644 --- a/input/regression/ledger-line-shorten.ly +++ b/input/regression/ledger-line-shorten.ly @@ -2,7 +2,7 @@ texidoc = "Ledger lines are shortened when they are very close. This ensures that ledger lines stay separate." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/ledger-lines-varying-staves.ly b/input/regression/ledger-lines-varying-staves.ly index 26c0b4ad69..f7c78d5849 100644 --- a/input/regression/ledger-lines-varying-staves.ly +++ b/input/regression/ledger-lines-varying-staves.ly @@ -1,4 +1,4 @@ -\version "2.11.52" +\version "2.12.0" \header { texidoc = "Ledger lines should appear at every other location for a variety of staves using both @code{line-count} and diff --git a/input/regression/ligature-bracket.ly b/input/regression/ligature-bracket.ly index 49b976b66b..756559c919 100644 --- a/input/regression/ligature-bracket.ly +++ b/input/regression/ligature-bracket.ly @@ -2,7 +2,7 @@ texidoc = "The ligature bracket right-end is not affected by other voices." } -\version "2.11.51" +\version "2.12.0" << \new Staff {\[b2 b\] | \[b b\] } \new Staff {b2 b | b4 b b b } diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index 2a0cd8b0d3..e9b34f6ec5 100644 --- a/input/regression/lily-in-scheme.ly +++ b/input/regression/lily-in-scheme.ly @@ -12,7 +12,7 @@ the @code{TextScript} grob. } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?) diff --git a/input/regression/line-arrows.ly b/input/regression/line-arrows.ly index bf1fe7ece8..fad16d4159 100644 --- a/input/regression/line-arrows.ly +++ b/input/regression/line-arrows.ly @@ -2,7 +2,7 @@ texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/line-dash-small-period.ly b/input/regression/line-dash-small-period.ly index e42e398c87..e55b6ec602 100644 --- a/input/regression/line-dash-small-period.ly +++ b/input/regression/line-dash-small-period.ly @@ -5,7 +5,7 @@ } -\version "2.11.53" +\version "2.12.0" \relative { \override Staff.OttavaBracket #'dash-period = #0.1 diff --git a/input/regression/line-dashed-period.ly b/input/regression/line-dashed-period.ly index 130d7fa764..c370429bd2 100644 --- a/input/regression/line-dashed-period.ly +++ b/input/regression/line-dashed-period.ly @@ -5,7 +5,7 @@ starts and ends on a full dash. " } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0.0\mm diff --git a/input/regression/line-style-zigzag-spacing.ly b/input/regression/line-style-zigzag-spacing.ly index 72fd521a54..e2de30aedc 100644 --- a/input/regression/line-style-zigzag-spacing.ly +++ b/input/regression/line-style-zigzag-spacing.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "Setting @code{'zigzag} style for spanners does not diff --git a/input/regression/line-style.ly b/input/regression/line-style.ly index 49909e8657..e2b9c99b73 100644 --- a/input/regression/line-style.ly +++ b/input/regression/line-style.ly @@ -2,7 +2,7 @@ texidoc = "Cover all line styles available" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index f8461c12eb..35824868cc 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "With the @code{\\lyricsto} mechanism, individual lyric lines can be associated with one melody line. Each lyric line diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index cf6db89a20..1420c43521 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Polyphonic rhythms and rests do not disturb diff --git a/input/regression/lyric-combine-switch-voice-2.ly b/input/regression/lyric-combine-switch-voice-2.ly index 88ea4064e5..ac2c7a4286 100644 --- a/input/regression/lyric-combine-switch-voice-2.ly +++ b/input/regression/lyric-combine-switch-voice-2.ly @@ -2,7 +2,7 @@ { texidoc = "switching voices in the middle of the lyrics is possible using @code{lyricsto}." } -\version "2.11.51" +\version "2.12.0" << \relative \new Voice = "lahlah" { diff --git a/input/regression/lyric-combine-switch-voice.ly b/input/regression/lyric-combine-switch-voice.ly index 02be517ebc..adc362e02b 100644 --- a/input/regression/lyric-combine-switch-voice.ly +++ b/input/regression/lyric-combine-switch-voice.ly @@ -5,7 +5,7 @@ if the switch occurs together with context instantiation." } -\version "2.11.51" +\version "2.12.0" << \relative \new Voice = "lahlah" { diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 1f35e71167..424653ee48 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly index 0517f2c9da..f35111b316 100644 --- a/input/regression/lyric-extender-broken.ly +++ b/input/regression/lyric-extender-broken.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/lyric-extender-no-heads.ly b/input/regression/lyric-extender-no-heads.ly index 5e5cbcdacf..8bafe34191 100644 --- a/input/regression/lyric-extender-no-heads.ly +++ b/input/regression/lyric-extender-no-heads.ly @@ -6,7 +6,7 @@ without a lyric attached." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/lyric-extender-rest.ly b/input/regression/lyric-extender-rest.ly index 2e66259233..ccf9aff74d 100644 --- a/input/regression/lyric-extender-rest.ly +++ b/input/regression/lyric-extender-rest.ly @@ -10,7 +10,7 @@ is not terminated upon encountering a rest. " ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" << \new Voice = "one" \relative c'' { diff --git a/input/regression/lyric-extender-right-margin.ly b/input/regression/lyric-extender-right-margin.ly index ca677fe0ef..0317b53493 100644 --- a/input/regression/lyric-extender-right-margin.ly +++ b/input/regression/lyric-extender-right-margin.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Extenders will not protrude into the right margin" } diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 9f69704bac..07cbce7772 100644 --- a/input/regression/lyric-extender.ly +++ b/input/regression/lyric-extender.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index c724992f2e..4e906329ac 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly index 787e313a9e..e567981a87 100644 --- a/input/regression/lyric-hyphen-retain.ly +++ b/input/regression/lyric-hyphen-retain.ly @@ -14,7 +14,7 @@ effect of a setting is delayed is one syllable." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index a0d9e7a069..ae3ea0e7eb 100644 --- a/input/regression/lyric-hyphen.ly +++ b/input/regression/lyric-hyphen.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In lyrics, hyphens may be used." } diff --git a/input/regression/lyric-melisma-manual.ly b/input/regression/lyric-melisma-manual.ly index 3b9426d04b..4072c40d7b 100644 --- a/input/regression/lyric-melisma-manual.ly +++ b/input/regression/lyric-melisma-manual.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/lyric-no-association-rhythm.ly b/input/regression/lyric-no-association-rhythm.ly index a724e5db1c..4003d721f4 100644 --- a/input/regression/lyric-no-association-rhythm.ly +++ b/input/regression/lyric-no-association-rhythm.ly @@ -8,7 +8,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \score { diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 8fc5495dd3..93d143c6e4 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/lyric-tie.ly b/input/regression/lyric-tie.ly index 1ff8271245..049bb4a47d 100644 --- a/input/regression/lyric-tie.ly +++ b/input/regression/lyric-tie.ly @@ -3,7 +3,7 @@ texidoc = "Tildes in lyric syllables are converted to tie symbols." } -\version "2.11.51" +\version "2.12.0" \lyrics { wa~o~a diff --git a/input/regression/lyrics-after-grace.ly b/input/regression/lyrics-after-grace.ly index 48beb4ac62..d168464638 100644 --- a/input/regression/lyrics-after-grace.ly +++ b/input/regression/lyrics-after-grace.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 2f60761fa0..f8b7d83575 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index 92f40932d8..008bb69e7b 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Melismata are triggered by manual beams." diff --git a/input/regression/lyrics-no-notes.ly b/input/regression/lyrics-no-notes.ly index f4b447f98a..3c6ef07e79 100644 --- a/input/regression/lyrics-no-notes.ly +++ b/input/regression/lyrics-no-notes.ly @@ -6,7 +6,7 @@ paper column is very wide." \layout{ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" << \new Staff \relative c' { \key aes \major diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly index 8314d09d1c..bc1f016967 100644 --- a/input/regression/lyrics-tenor-clef.ly +++ b/input/regression/lyrics-tenor-clef.ly @@ -2,7 +2,7 @@ texidoc = "Lyrics are not lowered despite the presence of an octavation 8." } -\version "2.11.51" +\version "2.12.0" \layout { \context { \Staff diff --git a/input/regression/markup-arrows.ly b/input/regression/markup-arrows.ly index c95a5571ee..aaa4d0cbe2 100644 --- a/input/regression/markup-arrows.ly +++ b/input/regression/markup-arrows.ly @@ -26,4 +26,4 @@ } } -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/markup-bidi-pango.ly b/input/regression/markup-bidi-pango.ly index 5466510945..e950beaa66 100644 --- a/input/regression/markup-bidi-pango.ly +++ b/input/regression/markup-bidi-pango.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/markup-column-align.ly b/input/regression/markup-column-align.ly index a2e1e4cad7..5d5a2c56c4 100644 --- a/input/regression/markup-column-align.ly +++ b/input/regression/markup-column-align.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "Fixed horizontal alignment of columns of text can be set using diff --git a/input/regression/markup-commands.ly b/input/regression/markup-commands.ly index d56128976e..688cd2e6a6 100644 --- a/input/regression/markup-commands.ly +++ b/input/regression/markup-commands.ly @@ -5,7 +5,7 @@ } \paper { ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" { g'_\markup { diff --git a/input/regression/markup-eps.ly b/input/regression/markup-eps.ly index 87300b363b..224af32c24 100644 --- a/input/regression/markup-eps.ly +++ b/input/regression/markup-eps.ly @@ -3,7 +3,7 @@ texidoc = "The epsfile markup command reads an EPS file" } -\version "2.11.51" +\version "2.12.0" #(let* ((port (open-output-file "box.eps"))) diff --git a/input/regression/markup-line-thickness.ly b/input/regression/markup-line-thickness.ly index ca6049cf10..2738783884 100644 --- a/input/regression/markup-line-thickness.ly +++ b/input/regression/markup-line-thickness.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/markup-lines.ly b/input/regression/markup-lines.ly index 73cad276ee..03500ebfd1 100644 --- a/input/regression/markup-lines.ly +++ b/input/regression/markup-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Text that can spread over pages is entered with the diff --git a/input/regression/markup-music-glyph.ly b/input/regression/markup-music-glyph.ly index 795b1a36ec..7fddd618c4 100644 --- a/input/regression/markup-music-glyph.ly +++ b/input/regression/markup-music-glyph.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" { c'^\markup diff --git a/input/regression/markup-note-dot.ly b/input/regression/markup-note-dot.ly index b0539ead99..1c5f807765 100644 --- a/input/regression/markup-note-dot.ly +++ b/input/regression/markup-note-dot.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = " A dotted whole note displayed via the @code{\\note} diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 5ea9ceb6a7..0cdc526b35 100644 --- a/input/regression/markup-note.ly +++ b/input/regression/markup-note.ly @@ -3,7 +3,7 @@ texidoc = "The note markup function may be used to make metronome markings. It works for a variety of flag, dot and duration settings." } -\version "2.11.51" +\version "2.12.0" \relative c'' { diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly index 12a97c0ee9..1e4295c804 100644 --- a/input/regression/markup-scheme.ly +++ b/input/regression/markup-scheme.ly @@ -25,7 +25,7 @@ For maintenance reasons, we don't excercise the entire markup command set. -\version "2.11.51" +\version "2.12.0" { \textLengthOn diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly index ba8d056382..8c686ec5ba 100644 --- a/input/regression/markup-score.ly +++ b/input/regression/markup-score.ly @@ -2,7 +2,7 @@ texidoc = "Use \\score block as markup command." } -\version "2.11.51" +\version "2.12.0" tuning = \markup { \score { diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index a318adc396..4d84c3e2c1 100644 --- a/input/regression/markup-stack.ly +++ b/input/regression/markup-stack.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header {texidoc="Markup scripts may be stacked."} \layout { ragged-right = ##t} { diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly index 3505e989c6..8a59a454b6 100644 --- a/input/regression/markup-syntax.ly +++ b/input/regression/markup-syntax.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Demo of markup texts, using LilyPond syntax." diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly index 2619982d28..6377347060 100644 --- a/input/regression/markup-user.ly +++ b/input/regression/markup-user.ly @@ -9,7 +9,7 @@ the @code{define-markup-command} scheme macro." -\version "2.11.51" +\version "2.12.0" #(define-markup-command (upcase paper props str) (string?) "Upcase the string characters. Syntax: \\upcase #\"string\"" diff --git a/input/regression/markup-word-wrap.ly b/input/regression/markup-word-wrap.ly index e1d1c17a90..ef9e5b065d 100644 --- a/input/regression/markup-word-wrap.ly +++ b/input/regression/markup-word-wrap.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \markup { this is normal text diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 84caac7eb9..3ddb019925 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly index a9998f037b..787cde444b 100644 --- a/input/regression/mensural-ligatures.ly +++ b/input/regression/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Mensural ligatures show different shapes, depending on the diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index b64d6cf726..e5b2477648 100644 --- a/input/regression/mensural.ly +++ b/input/regression/mensural.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "There is limited support for mensural notation: note head diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index 2e3fa860d2..409687cdfb 100644 --- a/input/regression/metronome-marking.ly +++ b/input/regression/metronome-marking.ly @@ -14,7 +14,7 @@ The marking is left aligned with the time signature, if there is one. \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 diff --git a/input/regression/metronome-parenthesized.ly b/input/regression/metronome-parenthesized.ly index ef32ccceb2..97a4bc7d18 100644 --- a/input/regression/metronome-parenthesized.ly +++ b/input/regression/metronome-parenthesized.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/metronome-text.ly b/input/regression/metronome-text.ly index 8282dbcc3c..44d0bd23c9 100644 --- a/input/regression/metronome-text.ly +++ b/input/regression/metronome-text.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/midi-drums.ly b/input/regression/midi-drums.ly index 98e2df3dbd..bd00285cf2 100644 --- a/input/regression/midi-drums.ly +++ b/input/regression/midi-drums.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Midi can create drums." } diff --git a/input/regression/midi-dynamics.ly b/input/regression/midi-dynamics.ly index cace5cf4da..ee18823a3d 100644 --- a/input/regression/midi-dynamics.ly +++ b/input/regression/midi-dynamics.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \score { \relative { diff --git a/input/regression/midi-grace.ly b/input/regression/midi-grace.ly index f89063e277..4f5feffc66 100644 --- a/input/regression/midi-grace.ly +++ b/input/regression/midi-grace.ly @@ -5,7 +5,7 @@ off will appear at tick 768 (2 * 384)." } -\version "2.11.51" +\version "2.12.0" \score { \relative c' { c4 diff --git a/input/regression/midi-lyric-barcheck.ly b/input/regression/midi-lyric-barcheck.ly index 6f6db96a53..42ba0fbe0d 100644 --- a/input/regression/midi-lyric-barcheck.ly +++ b/input/regression/midi-lyric-barcheck.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Lyrics in MIDI are aligned to ties and beams: diff --git a/input/regression/midi-microtone-off.ly b/input/regression/midi-microtone-off.ly index f254fb2da5..893ed44626 100644 --- a/input/regression/midi-microtone-off.ly +++ b/input/regression/midi-microtone-off.ly @@ -4,7 +4,7 @@ the next (possibly grace) note. " } -\version "2.11.51" +\version "2.12.0" \score { diff --git a/input/regression/midi-microtone.ly b/input/regression/midi-microtone.ly index 698befe248..478c925234 100644 --- a/input/regression/midi-microtone.ly +++ b/input/regression/midi-microtone.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The pitch wheel is used for microtones." } diff --git a/input/regression/midi-partial.ly b/input/regression/midi-partial.ly index 9c52fe51e9..d5aad2d06a 100644 --- a/input/regression/midi-partial.ly +++ b/input/regression/midi-partial.ly @@ -1,7 +1,7 @@ \header { texidoc = "MIDI and partial measures work together." } -\version "2.11.51" +\version "2.12.0" \score { { \partial 4 diff --git a/input/regression/midi-pedal.ly b/input/regression/midi-pedal.ly index 36cdf2b62f..c599902164 100644 --- a/input/regression/midi-pedal.ly +++ b/input/regression/midi-pedal.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \score { \relative { diff --git a/input/regression/midi-scales.ly b/input/regression/midi-scales.ly index 379ed9542b..9c7ae95b06 100644 --- a/input/regression/midi-scales.ly +++ b/input/regression/midi-scales.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" % candidate for regression. -gp \header { texidoc="Converting LilyPond input to MIDI and then again back with diff --git a/input/regression/midi-transposition.ly b/input/regression/midi-transposition.ly index 06c729e13f..8c6da9a33d 100644 --- a/input/regression/midi-transposition.ly +++ b/input/regression/midi-transposition.ly @@ -2,7 +2,7 @@ { texidoc = "should deliver f' in MIDI" } -\version "2.11.51" +\version "2.12.0" \score { { diff --git a/input/regression/midi-tuplets.ly b/input/regression/midi-tuplets.ly index e0235b5245..89fbe822c2 100644 --- a/input/regression/midi-tuplets.ly +++ b/input/regression/midi-tuplets.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/midi-volume-equaliser.ly b/input/regression/midi-volume-equaliser.ly index 8f87a74078..7586ae4a35 100644 --- a/input/regression/midi-volume-equaliser.ly +++ b/input/regression/midi-volume-equaliser.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a note, where groups stop one after diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index e209287275..e997d55b48 100644 --- a/input/regression/mm-rests2.ly +++ b/input/regression/mm-rests2.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index 781ed5c4a2..9189e0c6a8 100644 --- a/input/regression/multi-measure-rest-center.ly +++ b/input/regression/multi-measure-rest-center.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The multimeasure rest is centered exactly between bar lines." diff --git a/input/regression/multi-measure-rest-center2.ly b/input/regression/multi-measure-rest-center2.ly index aca8f0b093..22eaae2cd0 100644 --- a/input/regression/multi-measure-rest-center2.ly +++ b/input/regression/multi-measure-rest-center2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly index 577b55b5d6..1e5d20359f 100644 --- a/input/regression/multi-measure-rest-grace.ly +++ b/input/regression/multi-measure-rest-grace.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index 0def9abbd2..70c01d70fa 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "There are both long and short instrument names. diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly index a6cbd86151..14ddd436cf 100644 --- a/input/regression/multi-measure-rest-multi-staff-center.ly +++ b/input/regression/multi-measure-rest-multi-staff-center.ly @@ -4,7 +4,7 @@ independent on prefatory matter in other staves." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly index 1aaa6298d5..e0f268b176 100644 --- a/input/regression/multi-measure-rest-spacing.ly +++ b/input/regression/multi-measure-rest-spacing.ly @@ -8,7 +8,7 @@ extra spacing column is created. This should not cause problems." ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" << diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index 1df15fcb19..05ab44cd81 100644 --- a/input/regression/multi-measure-rest-text.ly +++ b/input/regression/multi-measure-rest-text.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { diff --git a/input/regression/multi-measure-rest-usebreve.ly b/input/regression/multi-measure-rest-usebreve.ly index 14e6ecc4b2..9bb8af348f 100644 --- a/input/regression/multi-measure-rest-usebreve.ly +++ b/input/regression/multi-measure-rest-usebreve.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="For longer measure lengths, the breve rest is used." diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index e56edbf99a..7edfd5939e 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/music-function-end-spanners.ly b/input/regression/music-function-end-spanners.ly index 3250372274..510af5eddd 100644 --- a/input/regression/music-function-end-spanners.ly +++ b/input/regression/music-function-end-spanners.ly @@ -6,7 +6,7 @@ end span events at the end of a note." } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right = ##T } diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index 5424dede7c..6a6ade9ce3 100644 --- a/input/regression/music-function.ly +++ b/input/regression/music-function.ly @@ -7,7 +7,7 @@ demonstrate a @code{\myBar} function, which works similar to @code{\bar}, but is implemented completely in Scheme." } -\version "2.11.51" +\version "2.12.0" myBar = #(define-music-function (parser location bar-type) (string?) (context-spec-music diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 3afea4a35b..661dc03511 100644 --- a/input/regression/music-map.ly +++ b/input/regression/music-map.ly @@ -10,7 +10,7 @@ and dynamics are left over. These are put onto the 2nd measure." } -\version "2.11.51" +\version "2.12.0" #(define (notes-to-skip m) "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips. diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index c4c59d26a7..7b455e74f8 100644 --- a/input/regression/newaddlyrics.ly +++ b/input/regression/newaddlyrics.ly @@ -26,4 +26,4 @@ } >> -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/no-staff.ly b/input/regression/no-staff.ly index 4254916def..a261fbe83e 100644 --- a/input/regression/no-staff.ly +++ b/input/regression/no-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" % possible rename to staff-something. -gp \header{ texidoc = "@cindex Staff Remove diff --git a/input/regression/non-centered-bar-lines.ly b/input/regression/non-centered-bar-lines.ly index 3c0738c96c..8749ae0f51 100644 --- a/input/regression/non-centered-bar-lines.ly +++ b/input/regression/non-centered-bar-lines.ly @@ -1,4 +1,4 @@ -\version "2.11.52" +\version "2.12.0" \header { texidoc = "Bar lines are positioned correctly when using custom staves which are not centered around position@tie{}0. diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 2de070a573..f4d9e94e3d 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" By default, text is set with empty horizontal dimensions. diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index 73a7ff8eba..cf68bae01b 100644 --- a/input/regression/note-head-chord.ly +++ b/input/regression/note-head-chord.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Note heads are flipped on the stem to prevent collisions. diff --git a/input/regression/note-head-harmonic-dotted.ly b/input/regression/note-head-harmonic-dotted.ly index f7e4f48b24..9f15136a83 100644 --- a/input/regression/note-head-harmonic-dotted.ly +++ b/input/regression/note-head-harmonic-dotted.ly @@ -1,4 +1,4 @@ -\version "2.11.58" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/note-head-harmonic-whole.ly b/input/regression/note-head-harmonic-whole.ly index 64eba923e9..be2b49aa79 100644 --- a/input/regression/note-head-harmonic-whole.ly +++ b/input/regression/note-head-harmonic-whole.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly index 9edbc5427a..775ab0c93b 100644 --- a/input/regression/note-head-harmonic.ly +++ b/input/regression/note-head-harmonic.ly @@ -13,7 +13,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" { diff --git a/input/regression/note-head-solfa.ly b/input/regression/note-head-solfa.ly index dcde23c6d8..b4d24ca852 100644 --- a/input/regression/note-head-solfa.ly +++ b/input/regression/note-head-solfa.ly @@ -5,7 +5,7 @@ is adjusted according to the step of the scale, as measured relative to the @code{tonic} property." } -\version "2.11.51" +\version "2.12.0" fragment = { \key c \major diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 3071c54de6..98d33a27f5 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Note head shapes may be set from several choices. diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 47c35f9d09..a59378224e 100644 --- a/input/regression/note-line.ly +++ b/input/regression/note-line.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Note head lines (e.g. glissando) diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index fa673aac2f..72ce5649fa 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" The number of stafflines of a staff can be set. Ledger diff --git a/input/regression/optimal-page-breaking-hstretch.ly b/input/regression/optimal-page-breaking-hstretch.ly index 1ffdb31aee..3205a976d5 100644 --- a/input/regression/optimal-page-breaking-hstretch.ly +++ b/input/regression/optimal-page-breaking-hstretch.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="The optimal page breaker will stretch the diff --git a/input/regression/option-help.ly b/input/regression/option-help.ly index da820deac2..db2a869d74 100644 --- a/input/regression/option-help.ly +++ b/input/regression/option-help.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Print the option help text, for comparison against diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly index a97629e714..f9263c7596 100644 --- a/input/regression/ottava-broken.ly +++ b/input/regression/ottava-broken.ly @@ -10,7 +10,7 @@ the end of the line (regardless of prefatory matter). } -\version "2.11.53" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/ottava-edge.ly b/input/regression/ottava-edge.ly index 604b583952..4a4680fe59 100644 --- a/input/regression/ottava-edge.ly +++ b/input/regression/ottava-edge.ly @@ -5,7 +5,7 @@ "Both edge heights of an ottava bracket can be specified." } -\version "2.11.53" +\version "2.12.0" \layout { ragged-right = ##t} diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 3aa9e03532..1c133a195a 100644 --- a/input/regression/ottava.ly +++ b/input/regression/ottava.ly @@ -11,7 +11,7 @@ markup can be tuned with @code{Staff.ottavation}. } -\version "2.11.53" +\version "2.12.0" %% . There must be a minimum distance between the octavation line and the %% topmost staff line, taking into account the height of the closing diff --git a/input/regression/override-nest.ly b/input/regression/override-nest.ly index f06eaa33cd..b1445374ad 100644 --- a/input/regression/override-nest.ly +++ b/input/regression/override-nest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Sublist of grob property lists may be also tuned. In the diff --git a/input/regression/page-break-between-scores.ly b/input/regression/page-break-between-scores.ly index 37616ecb9c..9ec2278784 100644 --- a/input/regression/page-break-between-scores.ly +++ b/input/regression/page-break-between-scores.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Page breaks work when they are placed at the end of a score, diff --git a/input/regression/page-break-turn-toplevel.ly b/input/regression/page-break-turn-toplevel.ly index bd3bc2506b..6c5feeb30f 100644 --- a/input/regression/page-break-turn-toplevel.ly +++ b/input/regression/page-break-turn-toplevel.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Page breaking and page turning commands (@code{\\pageBreak}, diff --git a/input/regression/page-break-warn-forbidden.ly b/input/regression/page-break-warn-forbidden.ly index 0e5d07a4e2..9b417333bd 100644 --- a/input/regression/page-break-warn-forbidden.ly +++ b/input/regression/page-break-warn-forbidden.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff { c'1 \glissando diff --git a/input/regression/page-breaking-page-count1.ly b/input/regression/page-breaking-page-count1.ly index 35a8d5e8b4..a7132a3f81 100644 --- a/input/regression/page-breaking-page-count1.ly +++ b/input/regression/page-breaking-page-count1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The number of pages in a score can be forced by setting diff --git a/input/regression/page-breaking-page-count2.ly b/input/regression/page-breaking-page-count2.ly index 33f4c04bb4..749f091ad3 100644 --- a/input/regression/page-breaking-page-count2.ly +++ b/input/regression/page-breaking-page-count2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The number of pages in a score can be forced by setting diff --git a/input/regression/page-breaking-page-count3.ly b/input/regression/page-breaking-page-count3.ly index bd82d1f6c0..a6c5156778 100644 --- a/input/regression/page-breaking-page-count3.ly +++ b/input/regression/page-breaking-page-count3.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The number of pages in a score can be forced by setting diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly index 83b88dea90..dc481627d0 100644 --- a/input/regression/page-breaks.ly +++ b/input/regression/page-breaks.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/page-label.ly b/input/regression/page-label.ly index 4ec9ee363d..6c57725739 100644 --- a/input/regression/page-label.ly +++ b/input/regression/page-label.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/regression/page-layout-manual-position.ly b/input/regression/page-layout-manual-position.ly index 7d5971c252..2335c6979d 100644 --- a/input/regression/page-layout-manual-position.ly +++ b/input/regression/page-layout-manual-position.ly @@ -8,7 +8,7 @@ systems may be placed absolutely on the printable area of the page." } -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6" 'portrait) diff --git a/input/regression/page-layout-twopass.ly b/input/regression/page-layout-twopass.ly index 41cacdc8d6..c1e93dfc1d 100644 --- a/input/regression/page-layout-twopass.ly +++ b/input/regression/page-layout-twopass.ly @@ -3,7 +3,7 @@ texidoc = "Page breaking details can be stored for later reference." } -\version "2.11.51" +\version "2.12.0" \paper { #(define write-page-layout #t) diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly index 807f05ddda..6674e53e43 100644 --- a/input/regression/page-layout.ly +++ b/input/regression/page-layout.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/page-limited-space.ly b/input/regression/page-limited-space.ly index 5eeb2a4461..7dcce9a259 100644 --- a/input/regression/page-limited-space.ly +++ b/input/regression/page-limited-space.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") \header { diff --git a/input/regression/page-minimal-page-breaking-last-page.ly b/input/regression/page-minimal-page-breaking-last-page.ly index 60a94d27af..3094b8c1be 100644 --- a/input/regression/page-minimal-page-breaking-last-page.ly +++ b/input/regression/page-minimal-page-breaking-last-page.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") \header { diff --git a/input/regression/page-minimal-page-breaking.ly b/input/regression/page-minimal-page-breaking.ly index 61e09c5984..d41d796456 100644 --- a/input/regression/page-minimal-page-breaking.ly +++ b/input/regression/page-minimal-page-breaking.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") \header { diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly index d5277d2057..dfafe2f1be 100644 --- a/input/regression/page-spacing.ly +++ b/input/regression/page-spacing.ly @@ -13,7 +13,7 @@ By setting @code{annotate-spacing}, we can see the effect of each property. } -\version "2.11.51" +\version "2.12.0" #(set-global-staff-size 11) diff --git a/input/regression/page-top-space.ly b/input/regression/page-top-space.ly index b8c4596602..fe84708be8 100644 --- a/input/regression/page-top-space.ly +++ b/input/regression/page-top-space.ly @@ -4,7 +4,7 @@ first system can be forced to be uniform." } -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6") diff --git a/input/regression/page-turn-page-breaking-auto-first-page.ly b/input/regression/page-turn-page-breaking-auto-first-page.ly index 53c5621f16..a9c3f31bf9 100644 --- a/input/regression/page-turn-page-breaking-auto-first-page.ly +++ b/input/regression/page-turn-page-breaking-auto-first-page.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By default, we start with page 1, which is on the right hand side diff --git a/input/regression/page-turn-page-breaking-auto-first-page2.ly b/input/regression/page-turn-page-breaking-auto-first-page2.ly index 5f0faeeba6..a71c222e63 100644 --- a/input/regression/page-turn-page-breaking-auto-first-page2.ly +++ b/input/regression/page-turn-page-breaking-auto-first-page2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By default, we start with page 1, which is on the right hand side diff --git a/input/regression/page-turn-page-breaking-badturns.ly b/input/regression/page-turn-page-breaking-badturns.ly index 3bc8dddde1..6780c7ee56 100644 --- a/input/regression/page-turn-page-breaking-badturns.ly +++ b/input/regression/page-turn-page-breaking-badturns.ly @@ -1,4 +1,4 @@ -\version "2.11.58" +\version "2.12.0" \header { texidoc="If there are no good places to have a page turn, diff --git a/input/regression/page-turn-page-breaking-repeats.ly b/input/regression/page-turn-page-breaking-repeats.ly index 4834ceb0d1..377db25c55 100644 --- a/input/regression/page-turn-page-breaking-repeats.ly +++ b/input/regression/page-turn-page-breaking-repeats.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The page-turn engraver will not count potential page diff --git a/input/regression/page-turn-page-breaking.ly b/input/regression/page-turn-page-breaking.ly index 45c033167a..371613f45b 100644 --- a/input/regression/page-turn-page-breaking.ly +++ b/input/regression/page-turn-page-breaking.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="The page-turn breaker will put a page turn after diff --git a/input/regression/parenthesize-singlenotes-chords-rests.ly b/input/regression/parenthesize-singlenotes-chords-rests.ly index 30e381beb9..007eafc0ff 100644 --- a/input/regression/parenthesize-singlenotes-chords-rests.ly +++ b/input/regression/parenthesize-singlenotes-chords-rests.ly @@ -10,7 +10,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { diff --git a/input/regression/parenthesize.ly b/input/regression/parenthesize.ly index c440fa8d81..737e2c00d2 100644 --- a/input/regression/parenthesize.ly +++ b/input/regression/parenthesize.ly @@ -12,7 +12,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative { c4 -\parenthesize -. diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly index b67cdadce9..3757d4bc7a 100644 --- a/input/regression/part-combine-a2.ly +++ b/input/regression/part-combine-a2.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="The a2 string is printed only on notes (i.e. not on rests), and only after chords, solo or polyphony." diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly index b6097e9425..382e23d3d2 100644 --- a/input/regression/part-combine-cross.ly +++ b/input/regression/part-combine-cross.ly @@ -4,7 +4,7 @@ " } -\version "2.11.51" +\version "2.12.0" vone = \relative a' { g4 g f f e e d d } vtwo = \relative a' { e4 e f f g g a a } diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly index 0016c04b5d..9c5ef8dae2 100644 --- a/input/regression/part-combine-global.ly +++ b/input/regression/part-combine-global.ly @@ -11,7 +11,7 @@ voices. " } -\version "2.11.51" +\version "2.12.0" vone = diff --git a/input/regression/part-combine-markup.ly b/input/regression/part-combine-markup.ly index ee054345c8..18a30b86a2 100644 --- a/input/regression/part-combine-markup.ly +++ b/input/regression/part-combine-markup.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Part combine texts accept markup." diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly index 70545a0fb4..8b0be53557 100644 --- a/input/regression/part-combine-mmrest-after-solo.ly +++ b/input/regression/part-combine-mmrest-after-solo.ly @@ -1,7 +1,7 @@ \header { texidoc = " Multimeasure rests are printed after solos, both for solo1 and for solo2." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \new Staff diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly index bb2f7cb858..63c1318910 100644 --- a/input/regression/part-combine-solo-end.ly +++ b/input/regression/part-combine-solo-end.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } << diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly index f72e8b1a88..5f0e7b8414 100644 --- a/input/regression/part-combine-solo-global.ly +++ b/input/regression/part-combine-solo-global.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \new Staff diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index 44ccbeee8f..6d7dc89c41 100644 --- a/input/regression/part-combine-solo.ly +++ b/input/regression/part-combine-solo.ly @@ -17,7 +17,7 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo vone = \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 } vtwo = \relative g' { g4. g8 r2 g4 r4 r2 g4 } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly index fc24962234..675b7c37a8 100644 --- a/input/regression/part-combine-text.ly +++ b/input/regression/part-combine-text.ly @@ -9,7 +9,7 @@ texts accordingly. } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } diff --git a/input/regression/part-combine-tuplet-end.ly b/input/regression/part-combine-tuplet-end.ly index ed3d036cea..87552a19a5 100644 --- a/input/regression/part-combine-tuplet-end.ly +++ b/input/regression/part-combine-tuplet-end.ly @@ -5,7 +5,7 @@ even after a switch, a tuplet ends correctly." } -\version "2.11.51" +\version "2.12.0" \new Staff << \partcombine diff --git a/input/regression/part-combine-tuplet-single.ly b/input/regression/part-combine-tuplet-single.ly index 5cb9c97717..2a2e100a3f 100644 --- a/input/regression/part-combine-tuplet-single.ly +++ b/input/regression/part-combine-tuplet-single.ly @@ -5,7 +5,7 @@ \paper { ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" \score { << diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly index 89f5fd5fcb..13a0d82096 100644 --- a/input/regression/part-combine.ly +++ b/input/regression/part-combine.ly @@ -11,7 +11,7 @@ \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" vone = \relative a' { g2 g g g4 g f' c c( c) c c c ~ c diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index 24fddc20ee..b8659e3625 100644 --- a/input/regression/pedal-bracket.ly +++ b/input/regression/pedal-bracket.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly index 2db41f63ec..2539d8563b 100644 --- a/input/regression/pedal-end.ly +++ b/input/regression/pedal-end.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Unterminated piano pedal brackets run to the end of the piece. " diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index 2d6660b2e0..a0101ff071 100644 --- a/input/regression/pedal-ped.ly +++ b/input/regression/pedal-ped.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The standard piano pedals style comes with Ped symbols. diff --git a/input/regression/phrasing-slur-dash.ly b/input/regression/phrasing-slur-dash.ly index 6fad54b21e..f8b13f57d9 100644 --- a/input/regression/phrasing-slur-dash.ly +++ b/input/regression/phrasing-slur-dash.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = " The appearance of phrasing slurs may be changed from solid to dotted or dashed. " diff --git a/input/regression/phrasing-slur-slur-avoid.ly b/input/regression/phrasing-slur-slur-avoid.ly index dd44fe6e5d..c94cd38fb8 100644 --- a/input/regression/phrasing-slur-slur-avoid.ly +++ b/input/regression/phrasing-slur-slur-avoid.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="@code{PhrasingSlur}s go over normal slurs." } diff --git a/input/regression/phrasing-slur-tuplet.ly b/input/regression/phrasing-slur-tuplet.ly index 8d017f4c5f..968a899095 100644 --- a/input/regression/phrasing-slur-tuplet.ly +++ b/input/regression/phrasing-slur-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.11.58" +\version "2.12.0" \header { texidoc = "Phrasing slurs do not collide with tuplet numbers." diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly index 078b4c33cb..00a9397ff6 100644 --- a/input/regression/predefined-fretboards.ly +++ b/input/regression/predefined-fretboards.ly @@ -1,5 +1,6 @@ +\version "2.12.0" + % add a chord shape -\version "2.11.65" \addChordShape #'bes #guitar-tuning #"x;1-1-(;3-2;3-3;3-4;1-1-);" diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly index 0fc715a705..6d88242c0a 100644 --- a/input/regression/prefatory-empty-spacing.ly +++ b/input/regression/prefatory-empty-spacing.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index 11d714a7b8..79d8eb4551 100644 --- a/input/regression/prefatory-spacing-matter.ly +++ b/input/regression/prefatory-spacing-matter.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Distances between prefatory items (e.g. clef, bar, diff --git a/input/regression/profile-property-access.ly b/input/regression/profile-property-access.ly index 0d31849fc8..4502719f68 100644 --- a/input/regression/profile-property-access.ly +++ b/input/regression/profile-property-access.ly @@ -7,7 +7,7 @@ #(ly:set-option 'profile-property-accesses #t) -\version "2.11.51" +\version "2.12.0" \include "../../input/typography-demo.ly" %\book { \score { {c4 } } } diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly index 9c2fd46ec3..50125f2f6f 100644 --- a/input/regression/property-grace-polyphony.ly +++ b/input/regression/property-grace-polyphony.ly @@ -7,7 +7,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { << { \grace e8 d2 } diff --git a/input/regression/property-nested-override.ly b/input/regression/property-nested-override.ly index 59bd26ff28..bfd63a7ed4 100644 --- a/input/regression/property-nested-override.ly +++ b/input/regression/property-nested-override.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "Nested properties may be overridden using Scheme list syntax. This test performs two property overrides: the first diff --git a/input/regression/property-nested-revert.ly b/input/regression/property-nested-revert.ly index 3163cded46..139169ad2c 100644 --- a/input/regression/property-nested-revert.ly +++ b/input/regression/property-nested-revert.ly @@ -6,7 +6,7 @@ Scheme list syntax." } -\version "2.11.51" +\version "2.12.0" \relative { f2 \glissando c diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index e5d801e012..c03b0ed614 100644 --- a/input/regression/property-once.ly +++ b/input/regression/property-once.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Once properties take effect during a single time step only." } diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly index 5593570e5e..2caea5994a 100644 --- a/input/regression/quote-cue-during.ly +++ b/input/regression/quote-cue-during.ly @@ -11,7 +11,7 @@ last note." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly index d259b3d49a..d55017c09d 100644 --- a/input/regression/quote-cyclic.ly +++ b/input/regression/quote-cyclic.ly @@ -6,7 +6,7 @@ example, there are notes with each full-bar rest." } -\version "2.11.51" +\version "2.12.0" A = \relative c' { c4 d e f | \cueDuring #"qB" #1 { R1 } | } B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c | } diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly index f28219d99a..225bf6ebdd 100644 --- a/input/regression/quote-during.ly +++ b/input/regression/quote-during.ly @@ -8,7 +8,7 @@ quoted. In this example, a 16th rest is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/quote-grace.ly b/input/regression/quote-grace.ly index c3854eb427..b276bc5b92 100644 --- a/input/regression/quote-grace.ly +++ b/input/regression/quote-grace.ly @@ -7,7 +7,7 @@ } \paper { ragged-right= ##t } -\version "2.11.51" +\version "2.12.0" quoted = \relative c'' { R1 \grace g16 f4 \grace a16 bes4 \grace b16 c4 c4 diff --git a/input/regression/quote-tie.ly b/input/regression/quote-tie.ly index 628d0abf6d..76eeefd0ac 100644 --- a/input/regression/quote-tie.ly +++ b/input/regression/quote-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly index a61a9ad292..6138485c0a 100644 --- a/input/regression/quote-transposition.ly +++ b/input/regression/quote-transposition.ly @@ -10,7 +10,7 @@ quoted ones) will transposed as well. " } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/quote-tuplet-end.ly b/input/regression/quote-tuplet-end.ly index f4cfbe192c..ccb100f1b1 100644 --- a/input/regression/quote-tuplet-end.ly +++ b/input/regression/quote-tuplet-end.ly @@ -3,7 +3,7 @@ texidoc ="Tuplet bracket ends properly when quoting." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/quote-tuplet.ly b/input/regression/quote-tuplet.ly index a6d6974938..6ce70dfe06 100644 --- a/input/regression/quote-tuplet.ly +++ b/input/regression/quote-tuplet.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/quote.ly b/input/regression/quote.ly index f8e7ae6132..759a3d0a4f 100644 --- a/input/regression/quote.ly +++ b/input/regression/quote.ly @@ -7,7 +7,7 @@ things are quoted. In this example, a 16th rest is not quoted, since @code{rest-event} is not in @code{quotedEventTypes}." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/ragged-bottom-one-page.ly b/input/regression/ragged-bottom-one-page.ly index 07f8f3885d..8e3cff69fb 100644 --- a/input/regression/ragged-bottom-one-page.ly +++ b/input/regression/ragged-bottom-one-page.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { texidoc = "For a one-page score, ragged-bottom should have the diff --git a/input/regression/ragged-right-compressed.ly b/input/regression/ragged-right-compressed.ly index a6ef7c6f63..d487bbff52 100644 --- a/input/regression/ragged-right-compressed.ly +++ b/input/regression/ragged-right-compressed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a score takes up only a single line and it is compressed, it diff --git a/input/regression/ragged-right-disabled.ly b/input/regression/ragged-right-disabled.ly index 5a21340a6d..b1b20bd6d5 100644 --- a/input/regression/ragged-right-disabled.ly +++ b/input/regression/ragged-right-disabled.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When ragged-right is specifically disabled, a score with only one diff --git a/input/regression/ragged-right-one-line.ly b/input/regression/ragged-right-one-line.ly index dcb38a4d27..eb134d1849 100644 --- a/input/regression/ragged-right-one-line.ly +++ b/input/regression/ragged-right-one-line.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When a score takes up only a single line and it is stretched, it diff --git a/input/regression/rehearsal-mark-align-priority.ly b/input/regression/rehearsal-mark-align-priority.ly index 1f02c7de70..c4a6b525ec 100644 --- a/input/regression/rehearsal-mark-align-priority.ly +++ b/input/regression/rehearsal-mark-align-priority.ly @@ -4,7 +4,7 @@ the alignment depends on which symbols are visible." } -\version "2.11.51" +\version "2.12.0" \relative { \override Score.RehearsalMark #'break-align-symbols = #'(clef key-signature staff-bar) diff --git a/input/regression/rehearsal-mark-align-staff-context.ly b/input/regression/rehearsal-mark-align-staff-context.ly index 0d2d4298a2..4fd1171c14 100644 --- a/input/regression/rehearsal-mark-align-staff-context.ly +++ b/input/regression/rehearsal-mark-align-staff-context.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "RehearsalMarks still align correctly if Mark_engraver is moved to diff --git a/input/regression/rehearsal-mark-align.ly b/input/regression/rehearsal-mark-align.ly index 0a5cde2292..d1f2fefe17 100644 --- a/input/regression/rehearsal-mark-align.ly +++ b/input/regression/rehearsal-mark-align.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative { c1 \mark "foo" diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index 04ea97688a..a54e1f8dea 100644 --- a/input/regression/rehearsal-mark-letter.ly +++ b/input/regression/rehearsal-mark-letter.ly @@ -8,7 +8,7 @@ after Z, double letters are used. The mark may be set with } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative c'' { diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly index 1110ca678b..3aab1f6af3 100644 --- a/input/regression/rehearsal-mark-number.ly +++ b/input/regression/rehearsal-mark-number.ly @@ -5,7 +5,7 @@ By setting @code{markFormatter} we may choose a different style of mark printing } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/relative-repeat.ly b/input/regression/relative-repeat.ly index 7fbfd08f5b..4cf17989f0 100644 --- a/input/regression/relative-repeat.ly +++ b/input/regression/relative-repeat.ly @@ -1,7 +1,7 @@ \header { texidoc = "Relative mode for repeats uses order of entry." } -\version "2.11.51" +\version "2.12.0" \relative { \repeat "unfold" 3 diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index 8a7bbe5e50..e624ac4135 100644 --- a/input/regression/repeat-line-break.ly +++ b/input/regression/repeat-line-break.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/repeat-percent-count-visibility.ly b/input/regression/repeat-percent-count-visibility.ly index 39e3fddb40..5266553766 100644 --- a/input/regression/repeat-percent-count-visibility.ly +++ b/input/regression/repeat-percent-count-visibility.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { texidoc = " Percent repeat counters can be shown at regular diff --git a/input/regression/repeat-percent-count.ly b/input/regression/repeat-percent-count.ly index 22262e898e..e9cf8c6d98 100644 --- a/input/regression/repeat-percent-count.ly +++ b/input/regression/repeat-percent-count.ly @@ -9,7 +9,7 @@ only if there are more than two repeats." } -\version "2.11.51" +\version "2.12.0" \relative c'' \new Voice { \set countPercentRepeats = ##t diff --git a/input/regression/repeat-percent-grace.ly b/input/regression/repeat-percent-grace.ly index 276167b0f0..ffd9952485 100644 --- a/input/regression/repeat-percent-grace.ly +++ b/input/regression/repeat-percent-grace.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Percent repeats are also centered when there is a grace note in a parallel staff. " diff --git a/input/regression/repeat-percent-kerning.ly b/input/regression/repeat-percent-kerning.ly index 530fb1ab0f..0826c653be 100644 --- a/input/regression/repeat-percent-kerning.ly +++ b/input/regression/repeat-percent-kerning.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = "The positioning of dots and slashes in percent repeat glyphs can be altered using @code{dot-negative-kern} and diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 28c6ec433d..d4bc04545c 100644 --- a/input/regression/repeat-percent-skipbars.ly +++ b/input/regression/repeat-percent-skipbars.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 543ca6108d..412ac8e753 100644 --- a/input/regression/repeat-percent.ly +++ b/input/regression/repeat-percent.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Measure repeats may be nested with beat repeats." } diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index 731b8eec02..2434b16254 100644 --- a/input/regression/repeat-slash.ly +++ b/input/regression/repeat-slash.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Within a bar, beat repeats denote that a music snippet should be played again." diff --git a/input/regression/repeat-tie.ly b/input/regression/repeat-tie.ly index 3866bd747b..546232d548 100644 --- a/input/regression/repeat-tie.ly +++ b/input/regression/repeat-tie.ly @@ -5,7 +5,7 @@ note head." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/repeat-tremolo-beams.ly b/input/regression/repeat-tremolo-beams.ly index f0bcfd7ca6..997ff46491 100644 --- a/input/regression/repeat-tremolo-beams.ly +++ b/input/regression/repeat-tremolo-beams.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Each of the staves here should have four tremolo beams." diff --git a/input/regression/repeat-tremolo-dots.ly b/input/regression/repeat-tremolo-dots.ly index 200e8b3b5d..86652c8150 100644 --- a/input/regression/repeat-tremolo-dots.ly +++ b/input/regression/repeat-tremolo-dots.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Dots are added to tremolo notes if the durations involved require them." diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly index b938cc2e73..92e8a47339 100644 --- a/input/regression/repeat-unfold-all.ly +++ b/input/regression/repeat-unfold-all.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Volta repeats may be unfolded through the music function @code{\unfoldRepeats}." diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly index 7b5444077f..71b5ac5650 100644 --- a/input/regression/repeat-unfold-tremolo.ly +++ b/input/regression/repeat-unfold-tremolo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Unfolding tremolo repeats. All fragments fill one diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly index bacd676278..d2a5da49e0 100644 --- a/input/regression/repeat-unfold.ly +++ b/input/regression/repeat-unfold.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="LilyPond has two modes for repeats: unfolded and semi-unfolded. diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 505e024bf6..6cd3ee1ca4 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When too few alternatives are present, the first diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index 647ed6f282..eb14c3cbd8 100644 --- a/input/regression/repeat-volta.ly +++ b/input/regression/repeat-volta.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/rest-collision-beam-note.ly b/input/regression/rest-collision-beam-note.ly index e410265d51..30f2a43910 100644 --- a/input/regression/rest-collision-beam-note.ly +++ b/input/regression/rest-collision-beam-note.ly @@ -6,7 +6,7 @@ collisions can be combined." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right=##t } diff --git a/input/regression/rest-collision-beam-quantized.ly b/input/regression/rest-collision-beam-quantized.ly index ef0bf41d97..0200d38c64 100644 --- a/input/regression/rest-collision-beam-quantized.ly +++ b/input/regression/rest-collision-beam-quantized.ly @@ -6,7 +6,7 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" fig = \relative c' { 8[ diff --git a/input/regression/rest-collision-beam-restdir.ly b/input/regression/rest-collision-beam-restdir.ly index 572feaf594..642512bd8f 100644 --- a/input/regression/rest-collision-beam-restdir.ly +++ b/input/regression/rest-collision-beam-restdir.ly @@ -3,7 +3,7 @@ account properly." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly index 38f1402987..1ec5441eb2 100644 --- a/input/regression/rest-collision-beam.ly +++ b/input/regression/rest-collision-beam.ly @@ -4,7 +4,7 @@ collision." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index e4f125e25d..1b98c177cf 100644 --- a/input/regression/rest-collision.ly +++ b/input/regression/rest-collision.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Rests should not collide with beams, stems and noteheads. Rests may diff --git a/input/regression/rest-dot-position.ly b/input/regression/rest-dot-position.ly index 7da6357adf..78a587d58c 100644 --- a/input/regression/rest-dot-position.ly +++ b/input/regression/rest-dot-position.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 58e02fd7f1..7ea955a369 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Whole and half rests moving outside the staff should get ledger lines." diff --git a/input/regression/rest-note-collision.ly b/input/regression/rest-note-collision.ly index c4f094dfbe..16a19df926 100644 --- a/input/regression/rest-note-collision.ly +++ b/input/regression/rest-note-collision.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff { << diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index 39736d6666..a413b7f4ca 100644 --- a/input/regression/rest-pitch.ly +++ b/input/regression/rest-pitch.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Rests can have pitches--these will be affected by diff --git a/input/regression/rest-pitched-beam.ly b/input/regression/rest-pitched-beam.ly index fa8a250fa9..a3f6c90e0a 100644 --- a/input/regression/rest-pitched-beam.ly +++ b/input/regression/rest-pitched-beam.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c'{ a\rest a8[ a\rest b] diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly index d260b90491..08e681a103 100644 --- a/input/regression/rest-polyphonic.ly +++ b/input/regression/rest-polyphonic.ly @@ -9,7 +9,7 @@ even if there is no opposite note or rest. The amount is two \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \new Staff \relative c' { diff --git a/input/regression/rest.ly b/input/regression/rest.ly index 62e9b58dd2..49656162bd 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 91bd361e43..10447e4b1e 100644 --- a/input/regression/rhythmic-staff.ly +++ b/input/regression/rhythmic-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/safe.ly b/input/regression/safe.ly index 4d6d905896..00952f2ddd 100644 --- a/input/regression/safe.ly +++ b/input/regression/safe.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" "expect-error" = ##t diff --git a/input/regression/score-text.ly b/input/regression/score-text.ly index 183caacc8e..b662217acd 100644 --- a/input/regression/score-text.ly +++ b/input/regression/score-text.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/script-center-seconds.ly b/input/regression/script-center-seconds.ly index 1925d747fa..aab8e48c0d 100644 --- a/input/regression/script-center-seconds.ly +++ b/input/regression/script-center-seconds.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative c''{ diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 65634ffcc8..3277be73ef 100644 --- a/input/regression/script-collision.ly +++ b/input/regression/script-collision.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/script-horizontal-slur.ly b/input/regression/script-horizontal-slur.ly index 6aadddc5fc..67a86bcee5 100644 --- a/input/regression/script-horizontal-slur.ly +++ b/input/regression/script-horizontal-slur.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Horizontal scripts don't have @code{avoid-slur} set." diff --git a/input/regression/script-shift.ly b/input/regression/script-shift.ly index 646096a8be..d5a3922643 100644 --- a/input/regression/script-shift.ly +++ b/input/regression/script-shift.ly @@ -7,7 +7,7 @@ means centered on the stem). " } -\version "2.11.66" +\version "2.12.0" \relative c'' { \override Script #'toward-stem-shift = #0.0 diff --git a/input/regression/script-stack-horizontal.ly b/input/regression/script-stack-horizontal.ly index de71c33ec7..f5b0646e1d 100644 --- a/input/regression/script-stack-horizontal.ly +++ b/input/regression/script-stack-horizontal.ly @@ -8,7 +8,7 @@ The scripts should not be folded under the time signature. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 0ad7be2165..cca3c7656c 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Scripts can be stacked. The order is determined by a priority field, but when objects have the same priority, the input diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index c7ebf37346..a3d559b4d3 100644 --- a/input/regression/script-stacked.ly +++ b/input/regression/script-stacked.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \layout { ragged-right= ##t } diff --git a/input/regression/script-stem-tremolo.ly b/input/regression/script-stem-tremolo.ly index c8e717c859..1a58cf5223 100644 --- a/input/regression/script-stem-tremolo.ly +++ b/input/regression/script-stem-tremolo.ly @@ -3,7 +3,7 @@ texidoc = "Scripts avoid stem tremolos even if there is no visible stem." } -\version "2.11.51" +\version "2.12.0" \layout {ragged-right =##t} { diff --git a/input/regression/semi-tie-manual-direction.ly b/input/regression/semi-tie-manual-direction.ly index f075907251..5972277098 100644 --- a/input/regression/semi-tie-manual-direction.ly +++ b/input/regression/semi-tie-manual-direction.ly @@ -3,7 +3,7 @@ texidoc = "Semi tie directions may be forced from the input." } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right=##t diff --git a/input/regression/size11.ly b/input/regression/size11.ly index fda3b0f0c9..2f8223d525 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 8c9fcd288a..09a4b62ad5 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index c8f34b1dc0..02260a969c 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 09cd4f4e33..c4eb50613f 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index cbf472f945..5245045af8 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 5a2f7d111f..d9dbecb6e6 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" foollilypondbook = " \score " diff --git a/input/regression/skip-of-length.ly b/input/regression/skip-of-length.ly index f5a3bcd049..01c575f42d 100644 --- a/input/regression/skip-of-length.ly +++ b/input/regression/skip-of-length.ly @@ -7,7 +7,7 @@ last as long as their arguments." ragged-right = ##T } -\version "2.11.51" +\version "2.12.0" \relative << diff --git a/input/regression/skiptypesetting-bar-check.ly b/input/regression/skiptypesetting-bar-check.ly index 40f3746946..14721f0bee 100644 --- a/input/regression/skiptypesetting-bar-check.ly +++ b/input/regression/skiptypesetting-bar-check.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/skiptypesetting-show-first-and-last.ly b/input/regression/skiptypesetting-show-first-and-last.ly index 4dda5fa38c..1395cea129 100644 --- a/input/regression/skiptypesetting-show-first-and-last.ly +++ b/input/regression/skiptypesetting-show-first-and-last.ly @@ -5,7 +5,7 @@ } -\version "2.11.63" +\version "2.12.0" showFirstLength = R1*1 showLastLength = R1*2 diff --git a/input/regression/skiptypesetting-show-first.ly b/input/regression/skiptypesetting-show-first.ly index b8d2f6b3bb..027f33e365 100644 --- a/input/regression/skiptypesetting-show-first.ly +++ b/input/regression/skiptypesetting-show-first.ly @@ -4,7 +4,7 @@ } -\version "2.11.63" +\version "2.12.0" showFirstLength = R1*3 \paper { diff --git a/input/regression/skiptypesetting-show-last.ly b/input/regression/skiptypesetting-show-last.ly index cd280cde08..e1845924b0 100644 --- a/input/regression/skiptypesetting-show-last.ly +++ b/input/regression/skiptypesetting-show-last.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" showLastLength = R1*3 \paper { diff --git a/input/regression/skiptypesetting-tuplet.ly b/input/regression/skiptypesetting-tuplet.ly index 4b7e51c2ae..07ec57e54e 100644 --- a/input/regression/skiptypesetting-tuplet.ly +++ b/input/regression/skiptypesetting-tuplet.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/skyline-debug.ly b/input/regression/skyline-debug.ly index 02c5aaa6c4..d6fb9e1077 100644 --- a/input/regression/skyline-debug.ly +++ b/input/regression/skyline-debug.ly @@ -1,7 +1,7 @@ \header { texidoc = "@code{-ddebug-skyline} draws the outline of the skyline used." } -\version "2.11.51" +\version "2.12.0" #(set-default-paper-size "a6" ) diff --git a/input/regression/skyline-vertical-placement.ly b/input/regression/skyline-vertical-placement.ly index bb9e11399f..731db4f2c5 100644 --- a/input/regression/skyline-vertical-placement.ly +++ b/input/regression/skyline-vertical-placement.ly @@ -5,7 +5,7 @@ using a skyline algorithm so that they don't collide with other objects." \layout {ragged-right = ##t} -\version "2.11.51" +\version "2.12.0" \relative c''' { \override TextScript #'outside-staff-priority = #2 \override DynamicLineSpanner #'outside-staff-priority = #1 diff --git a/input/regression/skyline-vertical-spacing.ly b/input/regression/skyline-vertical-spacing.ly index f94ffae468..159e1ca856 100644 --- a/input/regression/skyline-vertical-spacing.ly +++ b/input/regression/skyline-vertical-spacing.ly @@ -7,7 +7,7 @@ systems more uniform." \paper {ragged-right = ##t} #(set-default-paper-size "a6") -\version "2.11.51" +\version "2.12.0" \book { \score { { diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 45e55c7de0..f2c524e823 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/slur-clef.ly b/input/regression/slur-clef.ly index 5aaa2fb6c5..e9534fcbb1 100644 --- a/input/regression/slur-clef.ly +++ b/input/regression/slur-clef.ly @@ -6,6 +6,6 @@ ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \new Staff { \clef bass c4^( \clef "G" g'4) s2 c''1_( f'') } diff --git a/input/regression/slur-cross-staff-beam.ly b/input/regression/slur-cross-staff-beam.ly index 2ceaca6d7e..43230682be 100644 --- a/input/regression/slur-cross-staff-beam.ly +++ b/input/regression/slur-cross-staff-beam.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Slurs that depend on a cross-staff beam are not calculated until after line-breaking." diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index 76088ea634..3db78778ad 100644 --- a/input/regression/slur-cross-staff.ly +++ b/input/regression/slur-cross-staff.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Slurs behave decently when broken across a linebreak. diff --git a/input/regression/slur-dash.ly b/input/regression/slur-dash.ly index b8b5d7c956..cd80e244b8 100644 --- a/input/regression/slur-dash.ly +++ b/input/regression/slur-dash.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header {texidoc = "@cindex Slur, dotted, dashed The appearance of slurs may be changed from solid to dotted or dashed. " diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index 5b99dcf484..6b5ba394ad 100644 --- a/input/regression/slur-dots.ly +++ b/input/regression/slur-dots.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc="Slurs should not get confused by augmentation dots. With a lot of dots, the problems becomes more visible." diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly index 0d02183a08..93386d8a1b 100644 --- a/input/regression/slur-double.ly +++ b/input/regression/slur-double.ly @@ -3,7 +3,7 @@ texidoc = "Some composers use slurs both above and below chords. This can be typeset by setting @code{doubleSlurs}" } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative { diff --git a/input/regression/slur-dynamics.ly b/input/regression/slur-dynamics.ly index 9bd6fb1e02..d596231620 100644 --- a/input/regression/slur-dynamics.ly +++ b/input/regression/slur-dynamics.ly @@ -4,7 +4,7 @@ texidoc = "Dynamics avoid collision with slur." } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0\mm ragged-right = ##t diff --git a/input/regression/slur-extreme.ly b/input/regression/slur-extreme.ly index 2cd310ea3f..47d7d5ec30 100644 --- a/input/regression/slur-extreme.ly +++ b/input/regression/slur-extreme.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/slur-manual.ly b/input/regression/slur-manual.ly index 76ee50f759..36ab15345e 100644 --- a/input/regression/slur-manual.ly +++ b/input/regression/slur-manual.ly @@ -6,7 +6,7 @@ positioning of the slur. It selects the slur configuration closest to the given pair. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } \relative { diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index a1f834e88b..bc0f9c3310 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index c2bd273cf2..07c48656ef 100644 --- a/input/regression/slur-rest.ly +++ b/input/regression/slur-rest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Slurs may be placed over rests. The slur will avoid diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly index 8627cbf69d..a1b1ee4506 100644 --- a/input/regression/slur-scoring.ly +++ b/input/regression/slur-scoring.ly @@ -12,7 +12,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t % #(define debug-slur-scoring #t) diff --git a/input/regression/slur-script-inside.ly b/input/regression/slur-script-inside.ly index 1760b778ac..e4bdaae3ad 100644 --- a/input/regression/slur-script-inside.ly +++ b/input/regression/slur-script-inside.ly @@ -8,7 +8,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 937224496c..84629752eb 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -6,7 +6,7 @@ slur responds appropriately if a script is moved." } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0\mm ragged-right = ##t diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 204a955eff..a1d04f0a91 100644 --- a/input/regression/slur-symmetry-1.ly +++ b/input/regression/slur-symmetry-1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index 44c731272e..aea6979bc2 100644 --- a/input/regression/slur-symmetry.ly +++ b/input/regression/slur-symmetry.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Symmetric figures should lead to symmetric slurs." diff --git a/input/regression/slur-tilt.ly b/input/regression/slur-tilt.ly index 992e80b5b0..ee5e3c1e87 100644 --- a/input/regression/slur-tilt.ly +++ b/input/regression/slur-tilt.ly @@ -8,7 +8,7 @@ point into one note head, and point over another note head." \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative c'' { \time 2/4 diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly index bf03d252fd..eb5bae7aea 100644 --- a/input/regression/slur-tuplet.ly +++ b/input/regression/slur-tuplet.ly @@ -5,7 +5,7 @@ This may not work if the slur starts after the tuplet. " } -\version "2.11.65" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/song-associated-voice.ly b/input/regression/song-associated-voice.ly index 6b58961fd2..aceb759d8d 100644 --- a/input/regression/song-associated-voice.ly +++ b/input/regression/song-associated-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-basic-nonenglish.ly b/input/regression/song-basic-nonenglish.ly index a2b7971a95..4538db7ff0 100644 --- a/input/regression/song-basic-nonenglish.ly +++ b/input/regression/song-basic-nonenglish.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-basic.ly b/input/regression/song-basic.ly index 99f104d496..06d3e3b4f7 100644 --- a/input/regression/song-basic.ly +++ b/input/regression/song-basic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-breathe.ly b/input/regression/song-breathe.ly index 1c553be6de..f0484c130e 100644 --- a/input/regression/song-breathe.ly +++ b/input/regression/song-breathe.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-melisma.ly b/input/regression/song-melisma.ly index 8b33cde328..6eb9527061 100644 --- a/input/regression/song-melisma.ly +++ b/input/regression/song-melisma.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-reordering.ly b/input/regression/song-reordering.ly index 846ee23ba6..97081984a8 100644 --- a/input/regression/song-reordering.ly +++ b/input/regression/song-reordering.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-reordering2.ly b/input/regression/song-reordering2.ly index fa9f5ebba1..222b16d70a 100644 --- a/input/regression/song-reordering2.ly +++ b/input/regression/song-reordering2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-repetition.ly b/input/regression/song-repetition.ly index 9cfcdfacc6..e4b5ffa7dc 100644 --- a/input/regression/song-repetition.ly +++ b/input/regression/song-repetition.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-skip-noword.ly b/input/regression/song-skip-noword.ly index 2edbf4474f..17e578f945 100644 --- a/input/regression/song-skip-noword.ly +++ b/input/regression/song-skip-noword.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" #(set! *skip-word* #f) diff --git a/input/regression/song-skip.ly b/input/regression/song-skip.ly index fea42c24d1..825e548cae 100644 --- a/input/regression/song-skip.ly +++ b/input/regression/song-skip.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-slurs.ly b/input/regression/song-slurs.ly index 127ae8a4e6..57a54df7a6 100644 --- a/input/regression/song-slurs.ly +++ b/input/regression/song-slurs.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-splitpart.ly b/input/regression/song-splitpart.ly index 901694ca7e..9079a66a2b 100644 --- a/input/regression/song-splitpart.ly +++ b/input/regression/song-splitpart.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-stanzas.ly b/input/regression/song-stanzas.ly index ad805216b9..51fa612507 100644 --- a/input/regression/song-stanzas.ly +++ b/input/regression/song-stanzas.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/song-tempo.ly b/input/regression/song-tempo.ly index f32281359f..7eec2b6d4e 100644 --- a/input/regression/song-tempo.ly +++ b/input/regression/song-tempo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "festival.ly" diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index e5847b0bf0..17cbeb1cb3 100644 --- a/input/regression/spacing-accidental-staffs.ly +++ b/input/regression/spacing-accidental-staffs.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals in different staves do not affect the diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly index 653ea2afaf..931d443836 100644 --- a/input/regression/spacing-accidental-stretch.ly +++ b/input/regression/spacing-accidental-stretch.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals do not influence the amount of stretchable space. diff --git a/input/regression/spacing-accidental-tie.ly b/input/regression/spacing-accidental-tie.ly index 20238cbf50..afcd919335 100644 --- a/input/regression/spacing-accidental-tie.ly +++ b/input/regression/spacing-accidental-tie.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Horizontal spacing works as expected on tied notes with diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly index 5b4fd217b0..4cb0338040 100644 --- a/input/regression/spacing-accidental.ly +++ b/input/regression/spacing-accidental.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Accidentals sticking out to the left diff --git a/input/regression/spacing-bar-accidental.ly b/input/regression/spacing-bar-accidental.ly index 7a109eb827..edc807ba5f 100644 --- a/input/regression/spacing-bar-accidental.ly +++ b/input/regression/spacing-bar-accidental.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right = ##t } diff --git a/input/regression/spacing-bar-arpeggio.ly b/input/regression/spacing-bar-arpeggio.ly index 43c52b1466..cdec5b2039 100644 --- a/input/regression/spacing-bar-arpeggio.ly +++ b/input/regression/spacing-bar-arpeggio.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ragged-right=##t} \new Staff { diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 8079ac244d..c35d683139 100644 --- a/input/regression/spacing-bar-stem.ly +++ b/input/regression/spacing-bar-stem.ly @@ -9,7 +9,7 @@ to 1.5 staff space." } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right = ##t } diff --git a/input/regression/spacing-bar-whole-measure.ly b/input/regression/spacing-bar-whole-measure.ly index 5631171b56..c96228f619 100644 --- a/input/regression/spacing-bar-whole-measure.ly +++ b/input/regression/spacing-bar-whole-measure.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ ragged-right=##t diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index 7576ce6f1f..0024fc0a6a 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clef changes at the start of a line get much more space diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index e59642f25d..70fceceaaa 100644 --- a/input/regression/spacing-end-of-line.ly +++ b/input/regression/spacing-end-of-line.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Broken engraving of a bar at the end of a line does not upset diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index debe4cf67f..f4b4b83605 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " A voicelet (a very short voice to get polyphonic chords correct) should not confuse the spacing engine." diff --git a/input/regression/spacing-folded-clef-cross-staff.ly b/input/regression/spacing-folded-clef-cross-staff.ly index 9effc273e6..03c169b25f 100644 --- a/input/regression/spacing-folded-clef-cross-staff.ly +++ b/input/regression/spacing-folded-clef-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Clefs are also folded under cross staff constructs." } diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index e98d14994e..720c9834bf 100644 --- a/input/regression/spacing-folded-clef.ly +++ b/input/regression/spacing-folded-clef.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A clef can be folded below notes in a different staff, if this does not disrupt the flow of the notes." diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 914525e93d..d272a005e1 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A clef can be folded below notes in a different staff, if diff --git a/input/regression/spacing-folded-clef3.ly b/input/regression/spacing-folded-clef3.ly index 1fe4cf7fdd..e919050d10 100644 --- a/input/regression/spacing-folded-clef3.ly +++ b/input/regression/spacing-folded-clef3.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Voices that go back and forth between staves do not confuse the spacing engine." diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index 700bb6867d..e7b7b936a4 100644 --- a/input/regression/spacing-grace-duration.ly +++ b/input/regression/spacing-grace-duration.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Spacing uses the duration of the notes, but disregards diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly index d135c189a7..2c76e8b36a 100644 --- a/input/regression/spacing-grace.ly +++ b/input/regression/spacing-grace.ly @@ -5,7 +5,7 @@ run are spaced accordingly. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/spacing-horizontal-skyline-grace.ly b/input/regression/spacing-horizontal-skyline-grace.ly index 0ddc97c3ed..3b0db9daf2 100644 --- a/input/regression/spacing-horizontal-skyline-grace.ly +++ b/input/regression/spacing-horizontal-skyline-grace.ly @@ -6,7 +6,7 @@ and the barline do not collide." } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/regression/spacing-horizontal-skyline.ly b/input/regression/spacing-horizontal-skyline.ly index 39b1e82378..bf59899597 100644 --- a/input/regression/spacing-horizontal-skyline.ly +++ b/input/regression/spacing-horizontal-skyline.ly @@ -3,7 +3,7 @@ texidoc = "accidentals may be folded under preceding notes." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/spacing-knee-compressed.ly b/input/regression/spacing-knee-compressed.ly index 25981909ee..8cf8d2c0e8 100644 --- a/input/regression/spacing-knee-compressed.ly +++ b/input/regression/spacing-knee-compressed.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Spacing corrections for kneed beams still work when compression is involved." diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 536f6d87c2..b5c1895385 100644 --- a/input/regression/spacing-knee.ly +++ b/input/regression/spacing-knee.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "For knees, the spacing correction is such that the diff --git a/input/regression/spacing-loose-grace-error.ly b/input/regression/spacing-loose-grace-error.ly index de46da1d2c..470754f059 100644 --- a/input/regression/spacing-loose-grace-error.ly +++ b/input/regression/spacing-loose-grace-error.ly @@ -7,7 +7,7 @@ texidoc = "Even in case of incorrect contexts (eg. shortlived } -\version "2.11.51" +\version "2.12.0" %% \new Staff cause shortlived, disconnected Voice contexts diff --git a/input/regression/spacing-loose-grace-linebreak.ly b/input/regression/spacing-loose-grace-linebreak.ly index fdc511ce38..8cc2597294 100644 --- a/input/regression/spacing-loose-grace-linebreak.ly +++ b/input/regression/spacing-loose-grace-linebreak.ly @@ -4,7 +4,7 @@ across a line break, it gets attached to the end of line." } -\version "2.11.51" +\version "2.12.0" \new Score \with { \override SpacingSpanner #'strict-grace-spacing = ##t diff --git a/input/regression/spacing-loose-grace.ly b/input/regression/spacing-loose-grace.ly index d0929ef48a..77d50385d6 100644 --- a/input/regression/spacing-loose-grace.ly +++ b/input/regression/spacing-loose-grace.ly @@ -8,7 +8,7 @@ spacing." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/spacing-mark-width.ly b/input/regression/spacing-mark-width.ly index 8eee855a72..0b138d1cce 100644 --- a/input/regression/spacing-mark-width.ly +++ b/input/regression/spacing-mark-width.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/spacing-measure-length.ly b/input/regression/spacing-measure-length.ly index 87fd02aba9..8cfa85df4a 100644 --- a/input/regression/spacing-measure-length.ly +++ b/input/regression/spacing-measure-length.ly @@ -6,7 +6,7 @@ This means that the 3/8 setting does not affect the whole rest spacing." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index aafa19a531..f6b578fdf0 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/spacing-no-note.ly b/input/regression/spacing-no-note.ly index f3f0205481..fd1b3cc9af 100644 --- a/input/regression/spacing-no-note.ly +++ b/input/regression/spacing-no-note.ly @@ -6,7 +6,7 @@ more space. " } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" { \time 2/4 \repeat "percent" 3 { c'4 } diff --git a/input/regression/spacing-non-adjacent-columns1.ly b/input/regression/spacing-non-adjacent-columns1.ly index 1755aa284a..8176f2416a 100644 --- a/input/regression/spacing-non-adjacent-columns1.ly +++ b/input/regression/spacing-non-adjacent-columns1.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \paper {ragged-right = ##t} \header { texidoc = "The spacing engine avoids collisions between non-adjacent columns." diff --git a/input/regression/spacing-non-adjacent-columns2.ly b/input/regression/spacing-non-adjacent-columns2.ly index 8d36fb2df9..06579ae87b 100644 --- a/input/regression/spacing-non-adjacent-columns2.ly +++ b/input/regression/spacing-non-adjacent-columns2.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \paper {ragged-right = ##t} \header { texidoc = "The spacing engine avoids collisions between non-adjacent columns." diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 1bff3ec93b..6a85c59d01 100644 --- a/input/regression/spacing-note-flags.ly +++ b/input/regression/spacing-note-flags.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/spacing-packed.ly b/input/regression/spacing-packed.ly index c14a74f667..138dbf01b3 100644 --- a/input/regression/spacing-packed.ly +++ b/input/regression/spacing-packed.ly @@ -10,7 +10,7 @@ " } -\version "2.11.51" +\version "2.12.0" \relative { \override Score.SpacingSpanner #'packed-spacing = ##t diff --git a/input/regression/spacing-proportional.ly b/input/regression/spacing-proportional.ly index ea9107cb5c..2cc2b6cfd1 100644 --- a/input/regression/spacing-proportional.ly +++ b/input/regression/spacing-proportional.ly @@ -6,7 +6,7 @@ to the distance for the given duration." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly index aaac78f025..817ac43190 100644 --- a/input/regression/spacing-ragged-last.ly +++ b/input/regression/spacing-ragged-last.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index bb4f285b43..a55f4cbaf1 100644 --- a/input/regression/spacing-rest.ly +++ b/input/regression/spacing-rest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Rests get a little less space, since they are narrower. However, the quarter rest in feta font is relatively wide, causing this diff --git a/input/regression/spacing-section.ly b/input/regression/spacing-section.ly index b95c794919..065cb423df 100644 --- a/input/regression/spacing-section.ly +++ b/input/regression/spacing-section.ly @@ -11,7 +11,7 @@ the 4/16, and a 16th in the second section takes as much space as a { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \relative { \time 2/4 c4 c8 c diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index 0514305d02..8af2ae378c 100644 --- a/input/regression/spacing-short-notes.ly +++ b/input/regression/spacing-short-notes.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Notes that are shorter than the common shortest note get a diff --git a/input/regression/spacing-space-to-barline.ly b/input/regression/spacing-space-to-barline.ly index 47e8baa648..78dd605705 100644 --- a/input/regression/spacing-space-to-barline.ly +++ b/input/regression/spacing-space-to-barline.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "When space-to-barline is false, we measure the space between the note and the diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly index d5fe84524e..570dc6c873 100644 --- a/input/regression/spacing-stem-bar.ly +++ b/input/regression/spacing-stem-bar.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Upstem notes before a barline are printed with some extra diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly index c07e658183..a595db3ca2 100644 --- a/input/regression/spacing-stem-direction.ly +++ b/input/regression/spacing-stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index b4c1cd9d25..aa66276338 100644 --- a/input/regression/spacing-stem-same-direction.ly +++ b/input/regression/spacing-stem-same-direction.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "For juxtaposed chords with the same direction, a slight optical correction is used. It is constant, and works only if diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly index 19373fce16..d89ee89e22 100644 --- a/input/regression/spacing-stick-out.ly +++ b/input/regression/spacing-stick-out.ly @@ -7,7 +7,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/spacing-strict-notespacing.ly b/input/regression/spacing-strict-notespacing.ly index 6acf1411cb..63792bd589 100644 --- a/input/regression/spacing-strict-notespacing.ly +++ b/input/regression/spacing-strict-notespacing.ly @@ -9,7 +9,7 @@ time. This may cause collisions. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/spacing-strict-spacing-grace.ly b/input/regression/spacing-strict-spacing-grace.ly index 211e89ce7c..64614ebf87 100644 --- a/input/regression/spacing-strict-spacing-grace.ly +++ b/input/regression/spacing-strict-spacing-grace.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" << \override Score.SpacingSpanner #'strict-grace-spacing = ##t diff --git a/input/regression/spacing-to-empty-barline.ly b/input/regression/spacing-to-empty-barline.ly index ac8bced723..af26d8e5ca 100644 --- a/input/regression/spacing-to-empty-barline.ly +++ b/input/regression/spacing-to-empty-barline.ly @@ -1,4 +1,4 @@ -\version "2.11.50" +\version "2.12.0" \header { texidoc = "An empty barline does not confuse the spacing engine too much. diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 47cadb5372..483e7eef58 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Space from a normal note (or barline) to a grace note is diff --git a/input/regression/spacing-uniform-stretching.ly b/input/regression/spacing-uniform-stretching.ly index ba1457b9f5..f32952e387 100644 --- a/input/regression/spacing-uniform-stretching.ly +++ b/input/regression/spacing-uniform-stretching.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c'' << diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly index fd65763d2a..3ac07160ff 100644 --- a/input/regression/span-bar-break.ly +++ b/input/regression/span-bar-break.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/span-bar-partial.ly b/input/regression/span-bar-partial.ly index 33aab7de3d..6ef67048fe 100644 --- a/input/regression/span-bar-partial.ly +++ b/input/regression/span-bar-partial.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Span bars can be turned on/off on a staff-by-staff basis." } diff --git a/input/regression/span-bar-spacing.ly b/input/regression/span-bar-spacing.ly index 3f06520560..0133543e99 100644 --- a/input/regression/span-bar-spacing.ly +++ b/input/regression/span-bar-spacing.ly @@ -3,7 +3,7 @@ the accidentals should not collide with the bar lines." } -\version "2.11.51" +\version "2.12.0" upper = \relative c' { \key f \minor \time 12/8 diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 4ba6971a64..feb9520716 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Span bars are drawn only between staff bar lines. By setting bar lines to transparent, they are shown only between systems. diff --git a/input/regression/spanner-break-beyond-parent.ly b/input/regression/spanner-break-beyond-parent.ly index 3e9cb7de5d..4961d82e76 100644 --- a/input/regression/spanner-break-beyond-parent.ly +++ b/input/regression/spanner-break-beyond-parent.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-bottom = ##t } diff --git a/input/regression/spanner-break-overshoot.ly b/input/regression/spanner-break-overshoot.ly index 6516799df9..43953bbe65 100644 --- a/input/regression/spanner-break-overshoot.ly +++ b/input/regression/spanner-break-overshoot.ly @@ -8,7 +8,7 @@ prefatory matter." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index bd32da26f2..025bf892d2 100644 --- a/input/regression/staccato-pos.ly +++ b/input/regression/staccato-pos.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly index 0c70d67d15..bb3f17e80e 100644 --- a/input/regression/staff-halfway.ly +++ b/input/regression/staff-halfway.ly @@ -2,7 +2,7 @@ texidoc = "Staves can be started and stopped at command. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/staff-line-positions.ly b/input/regression/staff-line-positions.ly index a317e1cea6..498bd6ef52 100644 --- a/input/regression/staff-line-positions.ly +++ b/input/regression/staff-line-positions.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \new Staff \relative c' { diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index 9fa58fa852..c3bcc78b6a 100644 --- a/input/regression/staff-mixed-size.ly +++ b/input/regression/staff-mixed-size.ly @@ -7,7 +7,7 @@ large on smaller staves." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/staff-online-symbol-absence.ly b/input/regression/staff-online-symbol-absence.ly index 85bc4e81c6..583c690ece 100644 --- a/input/regression/staff-online-symbol-absence.ly +++ b/input/regression/staff-online-symbol-absence.ly @@ -1,4 +1,4 @@ -\version "2.11.55" +\version "2.12.0" \header { texidoc = "Symbols that need on-staffline info (like dots and ties) diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index 5058697693..53b0affb6d 100644 --- a/input/regression/staff-tweak.ly +++ b/input/regression/staff-tweak.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}. diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 05b5fa6f8f..8af4a9b2a7 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column." } diff --git a/input/regression/stem-direction-context.ly b/input/regression/stem-direction-context.ly index 342561bd4c..18315d1eaa 100644 --- a/input/regression/stem-direction-context.ly +++ b/input/regression/stem-direction-context.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \relative c'' \new Voice \with { \consists "Melody_engraver" \override Stem #'neutral-direction = #'() diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly index e041d41dfb..56fd43186b 100644 --- a/input/regression/stem-direction.ly +++ b/input/regression/stem-direction.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 2ff32f5c68..6274e711c6 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/stem-stemlet-whole.ly b/input/regression/stem-stemlet-whole.ly index b2b6e6896e..ba69bf2c31 100644 --- a/input/regression/stem-stemlet-whole.ly +++ b/input/regression/stem-stemlet-whole.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Stemlets don't cause stems on whole notes." } diff --git a/input/regression/stem-stemlet.ly b/input/regression/stem-stemlet.ly index 7279639842..5603b34457 100644 --- a/input/regression/stem-stemlet.ly +++ b/input/regression/stem-stemlet.ly @@ -5,7 +5,7 @@ length can be set with @code{stemlet-length}." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative { diff --git a/input/regression/stem-tremolo-forced-dir.ly b/input/regression/stem-tremolo-forced-dir.ly index d87e53f0a0..9b716b74c7 100644 --- a/input/regression/stem-tremolo-forced-dir.ly +++ b/input/regression/stem-tremolo-forced-dir.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } \relative c { diff --git a/input/regression/stem-tremolo-position.ly b/input/regression/stem-tremolo-position.ly index ea834903b3..e423eeb7c0 100644 --- a/input/regression/stem-tremolo-position.ly +++ b/input/regression/stem-tremolo-position.ly @@ -5,7 +5,7 @@ tilted extra on stem-down notes with a flag." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##T } diff --git a/input/regression/stem-tremolo-staff-space.ly b/input/regression/stem-tremolo-staff-space.ly index 1d4663e8a4..5d4e85d6bd 100644 --- a/input/regression/stem-tremolo-staff-space.ly +++ b/input/regression/stem-tremolo-staff-space.ly @@ -4,7 +4,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 394e55b31e..df26319330 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments diff --git a/input/regression/stencil-color-rotation.ly b/input/regression/stencil-color-rotation.ly index 88819aa9d0..7e89fa2cb1 100644 --- a/input/regression/stencil-color-rotation.ly +++ b/input/regression/stencil-color-rotation.ly @@ -2,7 +2,7 @@ texidoc = "Combinations of rotation and color do work." } -\version "2.11.51" +\version "2.12.0" \relative c'{ \override Hairpin #'rotation = #'(20 -1 0) \override Hairpin #'color = #(x11-color 'LimeGreen) diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly index d7138c1a96..b95fffb857 100644 --- a/input/regression/stencil-hacking.ly +++ b/input/regression/stencil-hacking.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" You can write stencil callbacks in Scheme, thus providing custom glyphs for notation elements. A simple example is diff --git a/input/regression/string-number-around-slur.ly b/input/regression/string-number-around-slur.ly index 42c8a392c2..bd4a5b4d5c 100644 --- a/input/regression/string-number-around-slur.ly +++ b/input/regression/string-number-around-slur.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" \header { texidoc = "String numbers should only be moved outside slurs when there diff --git a/input/regression/string-number.ly b/input/regression/string-number.ly index e479733cf4..1b8692de79 100644 --- a/input/regression/string-number.ly +++ b/input/regression/string-number.ly @@ -4,7 +4,7 @@ positioning mechanism as finger instructions." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index e65801313f..4ff06b0385 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The size of every system is correctly determined; this diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly index 0bfda8f312..e584dde393 100644 --- a/input/regression/system-overstrike.ly +++ b/input/regression/system-overstrike.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "By setting between-system-padding to a negative value, it is possible to eliminate the anti-collision constraints. Then setting @code{between-system-space} to a low (nonzero) value, diff --git a/input/regression/system-separator.ly b/input/regression/system-separator.ly index d7c58f197f..840a650ef4 100644 --- a/input/regression/system-separator.ly +++ b/input/regression/system-separator.ly @@ -1,4 +1,4 @@ -\version "2.11.64" +\version "2.12.0" \header { texidoc = "System separators may be defined as markups in the diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly index b6940b19f6..242f8d75f9 100644 --- a/input/regression/system-start-bracket.ly +++ b/input/regression/system-start-bracket.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A piano context included within a staff group should cause the piano brace to be drawn to the left of the staff angle diff --git a/input/regression/system-start-heavy-bar.ly b/input/regression/system-start-heavy-bar.ly index f5d8a51b22..25b84c21ac 100644 --- a/input/regression/system-start-heavy-bar.ly +++ b/input/regression/system-start-heavy-bar.ly @@ -1,7 +1,7 @@ \header { texidoc = "A heavy-bar system start delimiter may be created by tuning the @code{SystemStartBar} grob." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/system-start-nesting.ly b/input/regression/system-start-nesting.ly index ac4f539d51..1b9e249b4e 100644 --- a/input/regression/system-start-nesting.ly +++ b/input/regression/system-start-nesting.ly @@ -2,7 +2,7 @@ created with the @code{systemStartDelimiterHierarchy} property." } -\version "2.11.56" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tablature-banjo.ly b/input/regression/tablature-banjo.ly index 0246d540b6..cc5515b0fc 100644 --- a/input/regression/tablature-banjo.ly +++ b/input/regression/tablature-banjo.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/tablature-harmonic.ly b/input/regression/tablature-harmonic.ly index 8bec6998d3..1a32a62cd2 100644 --- a/input/regression/tablature-harmonic.ly +++ b/input/regression/tablature-harmonic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Harmonics get angled brackets in tablature" diff --git a/input/regression/tablature-slide.ly b/input/regression/tablature-slide.ly index d5b18d0ebd..6fd511f09c 100644 --- a/input/regression/tablature-slide.ly +++ b/input/regression/tablature-slide.ly @@ -4,7 +4,7 @@ texidoc = "Tab supports slides." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly index d404825691..d8f735e435 100644 --- a/input/regression/tablature-string-tunings.ly +++ b/input/regression/tablature-string-tunings.ly @@ -6,7 +6,7 @@ } -\version "2.11.51" +\version "2.12.0" \new TabStaff { diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly index 93f82a1aac..0c631e87a1 100644 --- a/input/regression/tablature.ly +++ b/input/regression/tablature.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc = "@cindex Tabulature A sample tablature, with both normal staff and tab. diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index ccc8586295..dca241b0d7 100644 --- a/input/regression/tag-filter.ly +++ b/input/regression/tag-filter.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "The @code{\\tag} command marks music expressions with a diff --git a/input/regression/test-output-distance.ly b/input/regression/test-output-distance.ly index a956be6192..84bb5773d7 100644 --- a/input/regression/test-output-distance.ly +++ b/input/regression/test-output-distance.ly @@ -5,7 +5,7 @@ it should always show up in the output-distance testing. " } -\version "2.11.51" +\version "2.12.0" #(define time (gettimeofday)) diff --git a/input/regression/text-spanner-attachment-alignment.ly b/input/regression/text-spanner-attachment-alignment.ly index f90cde8881..942de5ff4d 100644 --- a/input/regression/text-spanner-attachment-alignment.ly +++ b/input/regression/text-spanner-attachment-alignment.ly @@ -9,7 +9,7 @@ ragged-right = ##t } -\version "2.11.65" +\version "2.12.0" << \new Staff { \override TextSpanner #'(bound-details left text) = "*" diff --git a/input/regression/text-spanner-override-order.ly b/input/regression/text-spanner-override-order.ly index 4b3022f6bd..09baf614e2 100644 --- a/input/regression/text-spanner-override-order.ly +++ b/input/regression/text-spanner-override-order.ly @@ -5,7 +5,7 @@ } -\version "2.11.65" +\version "2.12.0" sample = \relative c'' { c2\startTextSpan c2 \break diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index 241f7878f9..27a00ca0e4 100644 --- a/input/regression/text-spanner.ly +++ b/input/regression/text-spanner.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= "Text spanners should not repeat start text when broken." } diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly index 4cc1b7e245..609437b95d 100644 --- a/input/regression/tie-accidental.ly +++ b/input/regression/tie-accidental.ly @@ -4,7 +4,7 @@ " } -\version "2.11.51" +\version "2.12.0" \paper { debug-tie-scoring = ##t diff --git a/input/regression/tie-arpeggio-collision.ly b/input/regression/tie-arpeggio-collision.ly index 22e3ef567d..a874e2b411 100644 --- a/input/regression/tie-arpeggio-collision.ly +++ b/input/regression/tie-arpeggio-collision.ly @@ -8,7 +8,7 @@ unarpegiated case." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t } diff --git a/input/regression/tie-arpeggio.ly b/input/regression/tie-arpeggio.ly index 37615498a2..e402303b19 100644 --- a/input/regression/tie-arpeggio.ly +++ b/input/regression/tie-arpeggio.ly @@ -9,7 +9,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative { diff --git a/input/regression/tie-broken-minimum-length.ly b/input/regression/tie-broken-minimum-length.ly index 4684d9d981..c7e9c512ee 100644 --- a/input/regression/tie-broken-minimum-length.ly +++ b/input/regression/tie-broken-minimum-length.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/tie-broken-other-staff.ly b/input/regression/tie-broken-other-staff.ly index 5acee70ae4..b5ba583827 100644 --- a/input/regression/tie-broken-other-staff.ly +++ b/input/regression/tie-broken-other-staff.ly @@ -3,7 +3,7 @@ in other staves." } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/tie-broken.ly b/input/regression/tie-broken.ly index 507b839158..41b71dc00b 100644 --- a/input/regression/tie-broken.ly +++ b/input/regression/tie-broken.ly @@ -3,7 +3,7 @@ texidoc = "Ties behave properly at line breaks." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } diff --git a/input/regression/tie-chord-broken-extremal.ly b/input/regression/tie-chord-broken-extremal.ly index 5c6280f485..71fb2f6156 100644 --- a/input/regression/tie-chord-broken-extremal.ly +++ b/input/regression/tie-chord-broken-extremal.ly @@ -1,4 +1,4 @@ -\version "2.11.65" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/tie-chord-debug.ly b/input/regression/tie-chord-debug.ly index 62a25e06d2..4a5abc2551 100644 --- a/input/regression/tie-chord-debug.ly +++ b/input/regression/tie-chord-debug.ly @@ -5,7 +5,7 @@ decisions made." } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly index b448058914..d5ab64e1e0 100644 --- a/input/regression/tie-chord-partial.ly +++ b/input/regression/tie-chord-partial.ly @@ -2,7 +2,7 @@ { texidoc = "Individual chord notes can also be tied" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 71ce356efd..2688680580 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -13,7 +13,7 @@ each system. " } -\version "2.11.51" +\version "2.12.0" \paper { indent = #0.0 diff --git a/input/regression/tie-direction-broken.ly b/input/regression/tie-direction-broken.ly index b1304f059c..25570e613f 100644 --- a/input/regression/tie-direction-broken.ly +++ b/input/regression/tie-direction-broken.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/tie-direction-manual.ly b/input/regression/tie-direction-manual.ly index 23304988bd..f6a6610c8c 100644 --- a/input/regression/tie-direction-manual.ly +++ b/input/regression/tie-direction-manual.ly @@ -4,7 +4,7 @@ This makes correction in complex chords easier." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right= ##t diff --git a/input/regression/tie-dot.ly b/input/regression/tie-dot.ly index b3ab2d0da4..9b2107c64e 100644 --- a/input/regression/tie-dot.ly +++ b/input/regression/tie-dot.ly @@ -3,7 +3,7 @@ texidoc = "Ties avoid collisions with dots." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##T } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 505b9b7433..c2e5606365 100644 --- a/input/regression/tie-grace.ly +++ b/input/regression/tie-grace.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Tying a grace to a following grace or main note works." } diff --git a/input/regression/tie-manual-vertical-tune.ly b/input/regression/tie-manual-vertical-tune.ly index a304f6da5d..0edfd18e16 100644 --- a/input/regression/tie-manual-vertical-tune.ly +++ b/input/regression/tie-manual-vertical-tune.ly @@ -1,23 +1,15 @@ -\header { - +\version "2.12.0" +\header { texidoc = "If using integers, the tie will vertically tuned for staff line avoidance. If using a floating point number, this is taken as the exact location." - } -\version "2.11.51" - -\layout { - ragged-right = ##t -} - -\version "2.11.51" \relative c'' { \override Tie #'staff-position = #3 d4 ~ \override Tie #'staff-position = #3.0 d ~ d - } +} diff --git a/input/regression/tie-manual.ly b/input/regression/tie-manual.ly index 3e5f252577..95be03dd47 100644 --- a/input/regression/tie-manual.ly +++ b/input/regression/tie-manual.ly @@ -11,7 +11,7 @@ You can leave a Tie alone by introducing a non-pair value } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##t diff --git a/input/regression/tie-semi-single.ly b/input/regression/tie-semi-single.ly index 625ed9b7cb..a5c226dc00 100644 --- a/input/regression/tie-semi-single.ly +++ b/input/regression/tie-semi-single.ly @@ -8,7 +8,7 @@ tweaked with @code{#'direction}." } -\version "2.11.51" +\version "2.12.0" \layout{ragged-right=##t} { diff --git a/input/regression/tie-single-chord.ly b/input/regression/tie-single-chord.ly index a1d8ced47e..ab5410d6bb 100644 --- a/input/regression/tie-single-chord.ly +++ b/input/regression/tie-single-chord.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/regression/tie-single-manual.ly b/input/regression/tie-single-manual.ly index e86c67562e..c505453d7f 100644 --- a/input/regression/tie-single-manual.ly +++ b/input/regression/tie-single-manual.ly @@ -5,7 +5,7 @@ specifying their @code{direction} and/or @code{staff-position}." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tie-single.ly b/input/regression/tie-single.ly index 60dd2fc0ee..c8e3278eb5 100644 --- a/input/regression/tie-single.ly +++ b/input/regression/tie-single.ly @@ -22,7 +22,7 @@ that otherwise don't fit in a space ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" frag = \relative c'' { diff --git a/input/regression/tie-whole.ly b/input/regression/tie-whole.ly index a030c7559e..e63d02b788 100644 --- a/input/regression/tie-whole.ly +++ b/input/regression/tie-whole.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative diff --git a/input/regression/to-xml.ly b/input/regression/to-xml.ly index 53177f60f6..1ac46ee0ef 100644 --- a/input/regression/to-xml.ly +++ b/input/regression/to-xml.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" testMusic = { << c''4 \\ g'4 >> } diff --git a/input/regression/toc.ly b/input/regression/toc.ly index f38acbb06e..94fe0f08e7 100644 --- a/input/regression/toc.ly +++ b/input/regression/toc.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "A table of contents is included using diff --git a/input/regression/trill-spanner-broken.ly b/input/regression/trill-spanner-broken.ly index b4bac596db..1ec7f8b17c 100644 --- a/input/regression/trill-spanner-broken.ly +++ b/input/regression/trill-spanner-broken.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = " diff --git a/input/regression/trill-spanner-grace.ly b/input/regression/trill-spanner-grace.ly index ddf2348d85..02b032aa26 100644 --- a/input/regression/trill-spanner-grace.ly +++ b/input/regression/trill-spanner-grace.ly @@ -2,7 +2,7 @@ texidoc = "Trill spanner can end on a grace note" } -\version "2.11.51" +\version "2.12.0" \layout { ragged-right = ##T } diff --git a/input/regression/trill-spanner-pitched-consecutive.ly b/input/regression/trill-spanner-pitched-consecutive.ly index 33fcf817dc..acd8e7b057 100644 --- a/input/regression/trill-spanner-pitched-consecutive.ly +++ b/input/regression/trill-spanner-pitched-consecutive.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Pitched trills on consecutive notes with the same diff --git a/input/regression/trill-spanner-pitched-forced.ly b/input/regression/trill-spanner-pitched-forced.ly index e888bbcdbb..2580752122 100644 --- a/input/regression/trill-spanner-pitched-forced.ly +++ b/input/regression/trill-spanner-pitched-forced.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Pitched trill accidentals can be forced." diff --git a/input/regression/trill-spanner-pitched.ly b/input/regression/trill-spanner-pitched.ly index 3ca0ba84cc..182639ac6c 100644 --- a/input/regression/trill-spanner-pitched.ly +++ b/input/regression/trill-spanner-pitched.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { diff --git a/input/regression/trill-spanner.ly b/input/regression/trill-spanner.ly index 1b59c7605c..180c60c2f4 100644 --- a/input/regression/trill-spanner.ly +++ b/input/regression/trill-spanner.ly @@ -5,7 +5,7 @@ the wavy line should appear to come from the crook of the r" } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t } \relative c'' { c1\startTrillSpan diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index be160d2f9f..1b9d32ee59 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "In combination with a beam, the bracket of the tuplet diff --git a/input/regression/tuplet-bracket-cross-staff.ly b/input/regression/tuplet-bracket-cross-staff.ly index d06d3cfb04..346287177a 100644 --- a/input/regression/tuplet-bracket-cross-staff.ly +++ b/input/regression/tuplet-bracket-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly index 4226f385b8..d8ceec7eb8 100644 --- a/input/regression/tuplet-broken.ly +++ b/input/regression/tuplet-broken.ly @@ -8,7 +8,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t diff --git a/input/regression/tuplet-full-length-extent.ly b/input/regression/tuplet-full-length-extent.ly index e2b1575c9e..cff49efa3c 100644 --- a/input/regression/tuplet-full-length-extent.ly +++ b/input/regression/tuplet-full-length-extent.ly @@ -4,7 +4,7 @@ attaching column for a full-length tuplet bracket can be ignored." } -\version "2.11.55" +\version "2.12.0" \new Staff { \set tupletFullLength = ##t diff --git a/input/regression/tuplet-full-length-note.ly b/input/regression/tuplet-full-length-note.ly index 88af2c64df..92a8f362b1 100644 --- a/input/regression/tuplet-full-length-note.ly +++ b/input/regression/tuplet-full-length-note.ly @@ -6,7 +6,7 @@ the next note, by setting @code{tupletFullLengthNote}." } -\version "2.11.51" +\version "2.12.0" \new RhythmicStaff { \set tupletFullLength = ##t diff --git a/input/regression/tuplet-full-length.ly b/input/regression/tuplet-full-length.ly index 827f291287..53ac8d57da 100644 --- a/input/regression/tuplet-full-length.ly +++ b/input/regression/tuplet-full-length.ly @@ -5,7 +5,7 @@ start of the next non-tuplet note. " } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t indent = 0.0 } diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly index 6bb3b94437..373e9c1567 100644 --- a/input/regression/tuplet-gap.ly +++ b/input/regression/tuplet-gap.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout { indent = 0.0\mm diff --git a/input/regression/tuplet-nest-beam.ly b/input/regression/tuplet-nest-beam.ly index e1e9dedbed..c6e53caa47 100644 --- a/input/regression/tuplet-nest-beam.ly +++ b/input/regression/tuplet-nest-beam.ly @@ -5,7 +5,7 @@ } -\version "2.11.51" +\version "2.12.0" \paper{ ragged-right=##t } diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index 8bba889660..c090b2beb7 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc=" Tuplets may be nested." diff --git a/input/regression/tuplet-no-stems.ly b/input/regression/tuplet-no-stems.ly index 0284c7e948..1bd57dde6e 100644 --- a/input/regression/tuplet-no-stems.ly +++ b/input/regression/tuplet-no-stems.ly @@ -3,7 +3,7 @@ } -\version "2.11.51" +\version "2.12.0" \layout{ \context{ diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index 20299c7cc3..06681150f5 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -6,7 +6,7 @@ for instance, bracketed (B) and non-bracketed (NB). } -\version "2.11.51" +\version "2.12.0" diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index f973361948..ca991b0eb5 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Tuplets may contain rests. " diff --git a/input/regression/tuplet-single-note.ly b/input/regression/tuplet-single-note.ly index 63d0d0e72d..f5cd442413 100644 --- a/input/regression/tuplet-single-note.ly +++ b/input/regression/tuplet-single-note.ly @@ -4,7 +4,7 @@ texidoc = "Show tuplet numbers also on single-note tuplets (otherwise the timing would look messed up!), but don't show a bracket. Make sure that tuplets without any notes don't show any number, either." } -\version "2.11.51" +\version "2.12.0" \paper { ragged-right = ##t indent = 0.0 } diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly index 7839819d95..51f319fb0e 100644 --- a/input/regression/tuplet-slope.ly +++ b/input/regression/tuplet-slope.ly @@ -15,7 +15,7 @@ The bracket direction is determined by the dominating stem direction. ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" \new Voice { \relative c'' { diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 50ab09c771..6bbdbe6d45 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Horizontal tuplet brackets are shifted vertically diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index a1b3f95bfc..63fd9643e3 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "2.11.51" +\version "2.12.0" \header{ texidoc=" diff --git a/input/regression/utf-8-mixed-text.ly b/input/regression/utf-8-mixed-text.ly index b688477b00..47e9f7513b 100644 --- a/input/regression/utf-8-mixed-text.ly +++ b/input/regression/utf-8-mixed-text.ly @@ -5,6 +5,6 @@ } -\version "2.11.51" +\version "2.12.0" \markup { "Здравствуйт Hallo" } diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly index ddede6d251..d8c5c5c9d5 100644 --- a/input/regression/utf-8.ly +++ b/input/regression/utf-8.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 85881e730b..c06de358c1 100644 --- a/input/regression/voice-follower.ly +++ b/input/regression/voice-follower.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc= " diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index a8ea6b00bf..0bcac60ab4 100644 --- a/input/regression/volta-broken-left-edge.ly +++ b/input/regression/volta-broken-left-edge.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc ="Broken volta spanners behave correctly at their left edge in all cases." diff --git a/input/regression/volta-markup-text.ly b/input/regression/volta-markup-text.ly index 6eedd3e2c6..6e0ad569dc 100644 --- a/input/regression/volta-markup-text.ly +++ b/input/regression/volta-markup-text.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "Volte using @code{repeatCommands} can have markup diff --git a/input/regression/volta-multi-staff-inner-staff.ly b/input/regression/volta-multi-staff-inner-staff.ly index 9839bc41cd..564f6657af 100644 --- a/input/regression/volta-multi-staff-inner-staff.ly +++ b/input/regression/volta-multi-staff-inner-staff.ly @@ -12,7 +12,7 @@ volta brackets on staves other than the topmost one." } } -\version "2.11.51" +\version "2.12.0" vmus = { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly index 389b6f78c3..0a87f89b2c 100644 --- a/input/regression/volta-multi-staff.ly +++ b/input/regression/volta-multi-staff.ly @@ -3,7 +3,7 @@ } \layout { ragged-right = ##t } -\version "2.11.51" +\version "2.12.0" vmus = { \repeat volta 2 c1 \alternative { d e } } diff --git a/input/regression/warn-conflicting-key-signatures.ly b/input/regression/warn-conflicting-key-signatures.ly index 5ff27e608c..80dc236fa2 100644 --- a/input/regression/warn-conflicting-key-signatures.ly +++ b/input/regression/warn-conflicting-key-signatures.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \header { texidoc = "If you specify two different key signatures at one point, a diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly index 09f35ece57..e75a168216 100644 --- a/input/regression/whiteout.ly +++ b/input/regression/whiteout.ly @@ -5,7 +5,7 @@ markup. The whitening effect only is only guaranteed for staff lines, since staff lines are in a lower layer than most other grobs. " } -\version "2.11.51" +\version "2.12.0" \paper { diff --git a/input/sakura-sakura.ly b/input/sakura-sakura.ly index 8bdcb2ebb5..2b86466b06 100644 --- a/input/sakura-sakura.ly +++ b/input/sakura-sakura.ly @@ -1,6 +1,6 @@ %% sakura-sakura.ly -\version "2.11.61" +\version "2.12.0" \header { diff --git a/input/simple-song.ly b/input/simple-song.ly index 654ca8f594..b05fa4613d 100644 --- a/input/simple-song.ly +++ b/input/simple-song.ly @@ -13,5 +13,5 @@ >> %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.11.61" +\version "2.12.0" diff --git a/input/simple.ly b/input/simple.ly index cfa72542fa..0ce4bf40af 100644 --- a/input/simple.ly +++ b/input/simple.ly @@ -4,4 +4,4 @@ } %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.11.61" +\version "2.12.0" diff --git a/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc b/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc index fe04ba0cc3..2c922a5af0 100644 --- a/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc +++ b/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc @@ -1,12 +1,12 @@ texidoces = " -Este ejemplo muestra cómo hacer una transcripción moderna de Canto -Gregoriano. El Canto Gregoriano no tiene compás ni plicas; utiliza +Este ejemplo muestra cómo hacer una transcripción moderna de canto +gregoriano. El canto gregoriano no tiene compás ni plicas; utiliza solamente cabezas de nota de blanca y de negra, y unas marcas especiales que indican silencios de distintas longitudes. " - doctitlees = "Plantilla para notación de música antigua (transcripción moderna de Canto Gregoriano)" + doctitlees = "Plantilla para notación de música antigua (transcripción moderna de canto gregoriano)" texidocde = " Dieses Beispiel zeigt eine moderne Transkription des Gregorianischen diff --git a/input/texidocs/changing-the-breath-mark-symbol.texidoc b/input/texidocs/changing-the-breath-mark-symbol.texidoc index d4950a6473..fdd1c4ebfd 100644 --- a/input/texidocs/changing-the-breath-mark-symbol.texidoc +++ b/input/texidocs/changing-the-breath-mark-symbol.texidoc @@ -1,6 +1,6 @@ texidoces = " El glifo de la marca de respiración se puede ajustar -sobreescribiendo la proopiedad de texto del objeto de presentación +sobreescribiendo la propiedad de texto del objeto de presentación @code{BreathingSign}, con cualquier otro texto de marcado. " diff --git a/input/texidocs/combining-two-parts-on-the-same-staff.texidoc b/input/texidocs/combining-two-parts-on-the-same-staff.texidoc index 2a5b213e83..55c8c0be30 100644 --- a/input/texidocs/combining-two-parts-on-the-same-staff.texidoc +++ b/input/texidocs/combining-two-parts-on-the-same-staff.texidoc @@ -3,7 +3,7 @@ La herramienta de combinación de partes ( instrucción @code{\\partcombine}) permite la combinación de varias partes diferentes sobre el mismo pentagrama. Las indicaciones textuales tales como \"solo\" o \"a2\" se añaden de forma predeterminada; -para quitarlas, sencillamente establezca la proopiedad +para quitarlas, sencillamente establezca la propiedad @code{printPartCombineTexts} al valor \"falso\". Para partituras vocales (como himnos), no hay necesidad de añadir los textos \"solo\" o \"a2\", por lo que se deben desactivar. Sin embargo, diff --git a/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc b/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc index de72a7111e..f17539ac85 100644 --- a/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc +++ b/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc @@ -6,7 +6,7 @@ Las abreviaturas se encuentran definidas dentro del archivo valores predeterminados. Se pueden modificar estos valores predeterminados para las abreviaturas. Por ejemplo, para asociar la abreviatura @code{-+} (@code{dashPlus}) con el símbolo del -semitrino en lugar del símboloo predeterminado +, asigne el valor +semitrino en lugar del símbolo predeterminado +, asigne el valor @code{trill} a la variable @code{dashPlus}: " diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index d320f821e5..6e261127ba 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header{ filename = "twinkle-pop.ly" composer = "traditional" diff --git a/input/typography-demo.ly b/input/typography-demo.ly index c9db11c198..9938f6ce11 100644 --- a/input/typography-demo.ly +++ b/input/typography-demo.ly @@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert" } -\version "2.11.61" +\version "2.12.0" ignoreMelisma = \set ignoreMelismata = ##t ignoreMelismaOff = \unset ignoreMelismata diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index bd3eddc659..411ed3c7b5 100644 --- a/input/wilhelmus.ly +++ b/input/wilhelmus.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" \header { texidoc = "Wilhelmus van Nassouwe" diff --git a/input/xiao-haizi-guai-guai.ly b/input/xiao-haizi-guai-guai.ly index cae08f8ae8..4fb107d344 100644 --- a/input/xiao-haizi-guai-guai.ly +++ b/input/xiao-haizi-guai-guai.ly @@ -4,7 +4,7 @@ %% hai2zi5: child, %% guai1-guai1: well-behaved) -\version "2.11.61" +\version "2.12.0" \header { title = "小孩子乖乖" diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 457fd734c4..7fcea1ccfe 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -411,13 +411,11 @@ Accidental_engraver::create_accidental (Accidental_entry *entry, } Grob * -Accidental_engraver::make_standard_accidental (Stream_event *note, +Accidental_engraver::make_standard_accidental (Stream_event * /* note */, Grob *note_head, Engraver *trans, bool cautionary) { - (void)note; - /* We construct the accidentals at the originating Voice level, so that we get the property settings for @@ -455,12 +453,10 @@ Accidental_engraver::make_standard_accidental (Stream_event *note, } Grob * -Accidental_engraver::make_suggested_accidental (Stream_event *note, +Accidental_engraver::make_suggested_accidental (Stream_event * /* note */, Grob *note_head, Engraver *trans) { - (void) note; - Grob *a = trans->make_item ("AccidentalSuggestion", note_head->self_scm ()); Side_position_interface::add_support (a, note_head); diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 2deea75cda..96d8667c9d 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -8,6 +8,7 @@ #include "all-font-metrics.hh" +#include "string-convert.hh" #include "international.hh" #include "main.hh" #include "open-type-font.hh" @@ -17,13 +18,16 @@ Index_to_charcode_map const * -All_font_metrics::get_index_to_charcode_map (string filename, FT_Face face) +All_font_metrics::get_index_to_charcode_map (string filename, + int face_index, + FT_Face face) { - if (filename_charcode_maps_map_.find (filename) + string key = filename + String_convert::int_string (face_index); + if (filename_charcode_maps_map_.find (key) == filename_charcode_maps_map_.end ()) - filename_charcode_maps_map_[filename] = make_index_to_charcode_map (face); + filename_charcode_maps_map_[key] = make_index_to_charcode_map (face); - return &filename_charcode_maps_map_[filename]; + return &filename_charcode_maps_map_[key]; } diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index f86edaecc8..af4f1fc2d9 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -302,27 +302,24 @@ Auto_beam_engraver::finalize () void -Auto_beam_engraver::acknowledge_beam (Grob_info info) +Auto_beam_engraver::acknowledge_beam (Grob_info /* info */) { - (void)info; check_bar_property (); if (stems_) end_beam (); } void -Auto_beam_engraver::acknowledge_bar_line (Grob_info info) +Auto_beam_engraver::acknowledge_bar_line (Grob_info /* info */) { - (void)info; check_bar_property (); if (stems_) end_beam (); } void -Auto_beam_engraver::acknowledge_rest (Grob_info info) +Auto_beam_engraver::acknowledge_rest (Grob_info /* info */) { - (void)info; check_bar_property (); if (stems_) end_beam (); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 18ad550e92..f13d8697c3 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -200,7 +200,7 @@ Bar_line::compound_barline (Grob *me, string str, Real h, } else if (str == "'") { - m = tick_bar_line (me, hair, h, rounded); + m = tick_bar_line (me, h, rounded); } else if (str == ".") { @@ -227,7 +227,7 @@ Bar_line::simple_barline (Grob *me, } Stencil -Bar_line::tick_bar_line (Grob *me, Real w, Real h, bool rounded) +Bar_line::tick_bar_line (Grob *me, Real h, bool rounded) { Real th = Staff_symbol_referencer::staff_space (me) / 2; Real line_thick = Staff_symbol_referencer::line_thickness (me); diff --git a/lily/beam.cc b/lily/beam.cc index c8adf5694d..dcca553227 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -893,10 +893,8 @@ Beam::no_visible_stem_positions (Grob *me, Interval default_value) */ MAKE_SCHEME_CALLBACK (Beam, calc_least_squares_positions, 2); SCM -Beam::calc_least_squares_positions (SCM smob, SCM posns) +Beam::calc_least_squares_positions (SCM smob, SCM /* posns */) { - (void) posns; - Grob *me = unsmob_grob (smob); int count = normal_stem_count (me); diff --git a/lily/book.cc b/lily/book.cc index 3a84865462..fa961d36f3 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -200,9 +200,14 @@ Book::process_bookparts (Paper_book *output_paper_book, Output_def *paper, Outpu { Paper_book *paper_book_part = book->process (paper, layout, output_paper_book); if (paper_book_part) - output_paper_book->add_bookpart (paper_book_part->self_scm ()); + { + output_paper_book->add_bookpart (paper_book_part->self_scm ()); + paper_book_part->unprotect (); + } } } + /* In a Paper_book, bookparts are stored in straight order */ + output_paper_book->bookparts_ = scm_reverse_x (output_paper_book->bookparts_, SCM_EOL); } void diff --git a/lily/box.cc b/lily/box.cc index 5cce139fd4..5c2af4d317 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -88,16 +88,14 @@ IMPLEMENT_TYPE_P (Box, "ly:box?"); IMPLEMENT_DEFAULT_EQUAL_P (Box); SCM -Box::mark_smob (SCM x) +Box::mark_smob (SCM /* x */) { - (void)x; return SCM_EOL; } int -Box::print_smob (SCM x, SCM p, scm_print_state*) +Box::print_smob (SCM /* x */, SCM p, scm_print_state*) { - (void)x; scm_puts ("#", p); return 1; } diff --git a/lily/context.cc b/lily/context.cc index 36e506cd7e..a1456a1bbf 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -46,9 +46,8 @@ Context::check_removal () } } -Context::Context (Context const &src) +Context::Context (Context const & /* src */) { - (void) src; assert (false); } diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 8b5eb08ef8..578f57266e 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -65,9 +65,8 @@ Custos_engraver::start_translation_timestep () } void -Custos_engraver::acknowledge_bar (Grob_info info) +Custos_engraver::acknowledge_bar (Grob_info /* info */) { - (void) info; custos_permitted_ = true; } diff --git a/lily/dot-configuration.cc b/lily/dot-configuration.cc index e2680bd2d2..e82c17257a 100644 --- a/lily/dot-configuration.cc +++ b/lily/dot-configuration.cc @@ -8,6 +8,7 @@ (c) 1997--2008 Han-Wen Nienhuys */ +#include #include "dot-configuration.hh" #include "dot-formatting-problem.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/duration-scheme.cc b/lily/duration-scheme.cc index a90fb1fda8..fe027dcf26 100644 --- a/lily/duration-scheme.cc +++ b/lily/duration-scheme.cc @@ -58,7 +58,7 @@ LY_DEFINE (ly_make_duration, "ly:make-duration", int dots = 0; if (dotcount != SCM_UNDEFINED) { - LY_ASSERT_TYPE (scm_is_integer, dotcount,2); + LY_ASSERT_TYPE (scm_is_integer, dotcount, 2); dots = scm_to_int (dotcount); } diff --git a/lily/engraver.cc b/lily/engraver.cc index dcda3031b4..9ac54f804e 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -106,13 +106,19 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback", #endif Grob * -Engraver::internal_make_grob (SCM symbol, SCM cause, char const *name, char const *file, int line, char const *fun) +Engraver::internal_make_grob (SCM symbol, + SCM cause, + char const * /* name */, + char const *file, + int line, + char const *fun) { - (void) file; - (void) fun; - (void) line; - (void) name; - +#ifdef NDEBUG + (void)file; + (void)line; + (void)fun; +#endif + SCM props = updated_grob_properties (context (), symbol); Grob *grob = 0; diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc index fadb5f1cb3..15d1278fbd 100644 --- a/lily/figured-bass-position-engraver.cc +++ b/lily/figured-bass-position-engraver.cc @@ -115,9 +115,8 @@ Figured_bass_position_engraver::stop_translation_timestep () } void -Figured_bass_position_engraver::acknowledge_end_bass_figure_alignment (Grob_info info) +Figured_bass_position_engraver::acknowledge_end_bass_figure_alignment (Grob_info /* info */) { - (void)info; stop_spanner (); } diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 1c4107e686..b48f38924f 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -45,14 +45,13 @@ Fingering_engraver::listen_fingering (Stream_event *ev) IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, stroke_finger); void -Fingering_engraver::listen_stroke_finger (Stream_event *ev) +Fingering_engraver::listen_stroke_finger (Stream_event * /* ev */) { /* FIXME: should do something. This function is mainly here to shut up a warning */ - (void)ev; } void diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc index ce4525467a..9de2cd112d 100644 --- a/lily/font-config-scheme.cc +++ b/lily/font-config-scheme.cc @@ -29,6 +29,8 @@ display_fontset (FcFontSet *fs) font = FcNameUnparse (fs->fonts[j]); if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &str) == FcResultMatch) retval += String_convert::form_string ("FILE %s\n", str); + if (FcPatternGetString (fs->fonts[j], FC_INDEX, 0, &str) == FcResultMatch) + retval += String_convert::form_string ("INDEX %s\n", str); if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &str) == FcResultMatch) retval += String_convert::form_string ("family %s\n ", str); if (FcPatternGetString (fs->fonts[j], diff --git a/lily/font-config.cc b/lily/font-config.cc index 8cbd46d9cc..96247f6f76 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -10,6 +10,7 @@ #if HAVE_FONTCONFIG +#include #include #include diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 9901f4c382..d9ccecbc91 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -185,9 +185,8 @@ Font_metric::word_stencil (string str) const } Stencil -Font_metric::text_stencil (string str) const +Font_metric::text_stencil (string /* str */) const { - (void) str; programming_error("Cannot get a text stencil from this font"); return Stencil (Box (), SCM_EOL); } diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 3e1052aed3..94c05ee607 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -345,10 +345,11 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect", } static SCM -accumulate_symbol (void *closure, SCM key, SCM val, SCM result) +accumulate_symbol (void * /* closure */, + SCM key, + SCM /* val */, + SCM result) { - (void) closure; - (void) val; return scm_cons (key, result); } diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index 9c37a1a7d2..da1437bfac 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -39,7 +39,9 @@ class All_font_metrics All_font_metrics (All_font_metrics const &); public: - Index_to_charcode_map const *get_index_to_charcode_map (string filename, FT_Face face); + Index_to_charcode_map const *get_index_to_charcode_map (string filename, + int face_index, + FT_Face face); All_font_metrics (string search_path); ~All_font_metrics (); diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh index 43db11e9c9..1ae1b59ae7 100644 --- a/lily/include/bar-line.hh +++ b/lily/include/bar-line.hh @@ -16,7 +16,7 @@ public: DECLARE_GROB_INTERFACE(); static Stencil dashed_bar_line (Grob *me, Real h, Real thick); - static Stencil tick_bar_line (Grob *me, Real w, Real h, bool rounded); + static Stencil tick_bar_line (Grob *me, Real h, bool rounded); static Stencil compound_barline (Grob *, string, Real height, bool rounded); static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded); static Interval bar_y_extent (Grob *, Grob *); diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh index 4880509636..3b6d830977 100644 --- a/lily/include/freetype.hh +++ b/lily/include/freetype.hh @@ -17,9 +17,6 @@ void init_freetype (); extern FT_Library freetype2_library; -FT_Face open_ft_face (string str); - string freetype_error_string (int code); #endif /* FREETYPE_HH */ - diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh index f79e4c07ba..8c85ea5efc 100644 --- a/lily/include/open-type-font.hh +++ b/lily/include/open-type-font.hh @@ -52,7 +52,7 @@ public: }; string get_otf_table (FT_Face face, string tag); -FT_Face open_ft_face (string str); +FT_Face open_ft_face (string str, FT_Long idx = 0); #endif /* OPEN_TYPE_FONT_HH */ diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh index 93ac7c11f8..dc93324da8 100644 --- a/lily/include/pango-font.hh +++ b/lily/include/pango-font.hh @@ -37,7 +37,7 @@ public: string description_string () const; SCM font_file_name () const; - void register_font_file (string, string); + void register_font_file (string, string, int); Stencil text_stencil (string, bool tight) const; Stencil pango_item_string_stencil (PangoItem const *, string, bool tight) const; diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 7997d11c33..45300af686 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -119,18 +119,16 @@ Key_engraver::listen_key_change (Stream_event *ev) } void -Key_engraver::acknowledge_clef (Grob_info info) +Key_engraver::acknowledge_clef (Grob_info /* info */) { - (void)info; SCM c = get_property ("createKeyOnClefChange"); if (to_boolean (c)) create_key (false); } void -Key_engraver::acknowledge_bar_line (Grob_info info) +Key_engraver::acknowledge_bar_line (Grob_info /* info */) { - (void)info; if (scm_is_pair (get_property ("keySignature"))) create_key (true); } diff --git a/lily/ly-module.cc b/lily/ly-module.cc index 4d6b0a8f97..eb73cd68cd 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -97,9 +97,11 @@ ly_module_symbols (SCM mod) } static SCM -entry_to_alist (void *closure, SCM key, SCM val, SCM result) +entry_to_alist (void * /* closure */, + SCM key, + SCM val, + SCM result) { - (void) closure; if (scm_variable_bound_p (val) == SCM_BOOL_T) return scm_cons (scm_cons (key, scm_variable_ref (val)), result); programming_error ("unbound variable in module"); @@ -134,9 +136,11 @@ ly_reexport_module (SCM mod) #ifdef MODULE_GC_KLUDGE static SCM -redefine_keyval (void *closure, SCM key, SCM val, SCM result) +redefine_keyval (void * /* closure */, + SCM key, + SCM val, + SCM result) { - (void)closure; SCM new_tab = result; scm_hashq_set_x (new_tab, key, val); return new_tab; diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index 26a4dfa587..b75d309f2a 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -260,10 +260,8 @@ Lyric_combine_music_iterator::find_voice () } void -Lyric_combine_music_iterator::process (Moment when) +Lyric_combine_music_iterator::process (Moment /* when */) { - (void) when; - /* see if associatedVoice has been changed */ Context *new_voice = find_voice (); if (new_voice) diff --git a/lily/main.cc b/lily/main.cc index 8fc3c3ceb6..ab25e953ce 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -12,6 +12,7 @@ #include #include #include +#include using namespace std; #include diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc index 5189f674b5..9957185f04 100644 --- a/lily/melody-engraver.cc +++ b/lily/melody-engraver.cc @@ -62,9 +62,8 @@ Melody_engraver::stop_translation_timestep () void -Melody_engraver::acknowledge_slur (Grob_info info) +Melody_engraver::acknowledge_slur (Grob_info /* info */) { - (void)info; melody_item_ = 0; } diff --git a/lily/minimal-page-breaking.cc b/lily/minimal-page-breaking.cc index 1b5fce910d..f26b4b5886 100644 --- a/lily/minimal-page-breaking.cc +++ b/lily/minimal-page-breaking.cc @@ -15,9 +15,8 @@ #include "paper-book.hh" static bool -is_break (Grob *g) +is_break (Grob *) { - (void) g; /* shutup warning */ return false; } diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc index 173226ac15..627504d922 100644 --- a/lily/module-scheme.cc +++ b/lily/module-scheme.cc @@ -19,9 +19,11 @@ */ static SCM -module_define_closure_func (void *closure, SCM key, SCM val, SCM result) +module_define_closure_func (void *closure, + SCM key, + SCM val, + SCM /* result */) { - (void) result; SCM module = (SCM) closure; if (scm_variable_bound_p (val) == SCM_BOOL_T) scm_module_define (module, key, scm_variable_ref (val)); diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc index 99d015067d..be395fa2d1 100644 --- a/lily/new-dynamic-engraver.cc +++ b/lily/new-dynamic-engraver.cc @@ -220,7 +220,11 @@ ADD_TRANSLATOR (New_dynamic_engraver, "TextSpanner ", /* read */ - "currentMusicalColumn ", + "crescendoSpanner " + "crescendoText " + "currentMusicalColumn " + "decrescendoSpanner " + "decrescendoText ", /* write */ "" diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 5078e2d2db..cd9532206d 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -125,10 +125,8 @@ New_fingering_engraver::acknowledge_stem (Grob_info inf) void New_fingering_engraver::add_script (Grob *head, Stream_event *event, - Stream_event *note) + Stream_event * /* note */) { - (void) note; - Finger_tuple ft; Grob *g = make_item ("Script", event->self_scm ()); diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 97c49feca2..3bd52480a1 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -91,18 +91,17 @@ get_otf_table (FT_Face face, string tag) } FT_Face -open_ft_face (string str) +open_ft_face (string str, FT_Long idx) { FT_Face face; - int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face); + int error_code = FT_New_Face (freetype2_library, str.c_str (), idx, &face); if (error_code == FT_Err_Unknown_File_Format) error (_f ("unsupported font format: %s", str.c_str ())); else if (error_code) error (_f ("error reading font file %s: %s", str.c_str (), - freetype_error_string (error_code).c_str () - )); + freetype_error_string (error_code).c_str ())); return face; } diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc index f495ab7fa6..c5a6133563 100644 --- a/lily/optimal-page-breaking.cc +++ b/lily/optimal-page-breaking.cc @@ -18,9 +18,8 @@ #include "system.hh" static bool -is_break (Grob *g) +is_break (Grob *) { - (void) g; /* shutup warning */ return false; } diff --git a/lily/output-def.cc b/lily/output-def.cc index 1fcc5f596e..212731bd5f 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -92,8 +92,6 @@ Output_def::print_smob (SCM s, SCM p, scm_print_state *) Output_def * def = unsmob_output_def (s); scm_puts ("#< ", p); scm_puts (def->class_name (), p); - - (void)def; scm_puts (">", p); return 1; } diff --git a/lily/page-spacing-result.cc b/lily/page-spacing-result.cc index 93c737c839..02cb009b43 100644 --- a/lily/page-spacing-result.cc +++ b/lily/page-spacing-result.cc @@ -8,6 +8,7 @@ */ #include "page-spacing-result.hh" +#include Page_spacing_result::Page_spacing_result () { diff --git a/lily/pango-font-scheme.cc b/lily/pango-font-scheme.cc index 955b4a8f16..2c6f13cc07 100644 --- a/lily/pango-font-scheme.cc +++ b/lily/pango-font-scheme.cc @@ -30,7 +30,8 @@ LY_DEFINE (ly_pango_font_p, "ly:pango-font?", LY_DEFINE (ly_pango_font_physical_fonts, "ly:pango-font-physical-fonts", 1, 0, 0, (SCM f), - "Return alist of @code{(PSNAME . FILENAME)} tuples.") + "Return alist of @code{(ps-name file-name font-index)} lists" + " for Pango font@tie{}@var{f}.") { Pango_font *pf = dynamic_cast (unsmob_metrics (f)); diff --git a/lily/pango-font.cc b/lily/pango-font.cc index aa2c7f35c4..f6456dd826 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -11,8 +11,9 @@ #include #include +#include -/* Ugh. */ +// Ugh. #include "pango-font.hh" #include "dimensions.hh" @@ -28,32 +29,27 @@ #if HAVE_PANGO_FT2 #include "stencil.hh" -Pango_font::Pango_font (PangoFT2FontMap *fontmap, +Pango_font::Pango_font (PangoFT2FontMap * /* fontmap */, PangoFontDescription const *description, Real output_scale) { - (void) fontmap; - physical_font_tab_ = scm_c_make_hash_table (11); PangoDirection pango_dir = PANGO_DIRECTION_LTR; - context_ - = pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION); + context_ = pango_ft2_get_context (PANGO_RESOLUTION, + PANGO_RESOLUTION); pango_description_ = pango_font_description_copy (description); attribute_list_ = pango_attr_list_new (); - /* - urgh. I don't understand this. Why isn't this 1/(scale * - resolution * output_scale) - - --hwn - */ + // urgh. I don't understand this. Why isn't this 1/(scale * + // resolution * output_scale) + // + // --hwn output_scale_ = output_scale; - scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); + scale_ = INCH_TO_BP + / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); - /* - ugh. Should make this configurable. - */ + // ugh. Should make this configurable. pango_context_set_language (context_, pango_language_from_string ("en_US")); pango_context_set_base_dir (context_, pango_dir); pango_context_set_font_description (context_, description); @@ -67,11 +63,14 @@ Pango_font::~Pango_font () } void -Pango_font::register_font_file (string filename, string ps_name) +Pango_font::register_font_file (string filename, + string ps_name, + int face_index) { scm_hash_set_x (physical_font_tab_, ly_string2scm (ps_name), - ly_string2scm (filename)); + scm_list_2 (ly_string2scm (filename), + scm_from_int (face_index))); } void @@ -80,32 +79,33 @@ Pango_font::derived_mark () const scm_gc_mark (physical_font_tab_); } - void -get_glyph_index_name (char *s, FT_ULong code) +get_glyph_index_name (char *s, + FT_ULong code) { sprintf (s, "glyphIndex%lX", code); } void -get_unicode_name (char*s, FT_ULong code) +get_unicode_name (char *s, + FT_ULong code) { if (code > 0xFFFF) - sprintf (s, "u%lX", code); + sprintf (s, "u%lX", code); else - sprintf (s, "uni%04lX", code); + sprintf (s, "uni%04lX", code); } - Stencil -Pango_font::pango_item_string_stencil (PangoItem const *item, string str, +Pango_font::pango_item_string_stencil (PangoItem const *item, + string str, bool tight_bbox) const { const int GLYPH_NAME_LEN = 256; char glyph_name[GLYPH_NAME_LEN]; PangoAnalysis const *pa = &(item->analysis); PangoGlyphString *pgs = pango_glyph_string_new (); - + pango_shape (str.c_str () + item->offset, item->length, (PangoAnalysis*) pa, pgs); @@ -119,39 +119,44 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, FT_Face ftface = pango_fc_font_lock_face (fcfont); - PangoRectangle const *which_rect - = (tight_bbox) - ? &ink_rect - : &logical_rect; - + PangoRectangle const *which_rect = tight_bbox ? &ink_rect + : &logical_rect; + Box b (Interval (PANGO_LBEARING (logical_rect), PANGO_RBEARING (logical_rect)), Interval (-PANGO_DESCENT (*which_rect), PANGO_ASCENT (*which_rect))); - b.scale (scale_); + char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); FcPattern *fcpat = fcfont->font_pattern; + FcChar8 *file_name_as_ptr = 0; FcPatternGetString (fcpat, FC_FILE, 0, &file_name_as_ptr); + // due to a bug in FreeType 2.3.7 and earlier we can't use + // ftface->face_index; it is always zero for some font formats, + // in particular TTCs which we are interested in + int face_index = 0; + FcPatternGetInteger (fcpat, FC_INDEX, 0, &face_index); + string file_name; if (file_name_as_ptr) - { - /* Normalize file name. */ - file_name = File_name ((char const *)file_name_as_ptr).to_string (); - } - + // Normalize file name. + file_name = File_name ((char const *)file_name_as_ptr).to_string (); + SCM glyph_exprs = SCM_EOL; SCM *tail = &glyph_exprs; - + Index_to_charcode_map const *cmap = 0; bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES; - if (! has_glyph_names) - cmap = all_fonts_global->get_index_to_charcode_map (file_name, ftface); + if (!has_glyph_names) + cmap = all_fonts_global->get_index_to_charcode_map ( + file_name, face_index, ftface); bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType"; bool cid_keyed = false; + for (int i = 0; i < pgs->num_glyphs; i++) { PangoGlyphInfo *pgi = pgs->glyphs + i; @@ -162,11 +167,12 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, glyph_name[0] = '\0'; if (has_glyph_names) { - int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); + int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, + GLYPH_NAME_LEN); if (errorcode) - programming_error (_f ("FT_Get_Glyph_Name () error: %s", - freetype_error_string (errorcode).c_str () - )); + programming_error ( + _f ("FT_Get_Glyph_Name () error: %s", + freetype_error_string (errorcode).c_str ())); } SCM char_id = SCM_EOL; @@ -179,51 +185,44 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, get_unicode_name (glyph_name, char_code); } - if (glyph_name[0] == '\0' && has_glyph_names) + if (glyph_name[0] == '\0' && has_glyph_names) { - programming_error (_f ("Glyph has no name, but font supports glyph naming.\n" - "Skipping glyph U+%0X, file %s", - pg, - file_name.c_str ())); + programming_error ( + _f ("Glyph has no name, but font supports glyph naming.\n" + "Skipping glyph U+%0X, file %s", + pg, file_name.c_str ())); continue; } - if (glyph_name == string (".notdef") && is_ttf) glyph_name[0] = '\0'; - + if (glyph_name[0] == '\0' && is_ttf) - { - // access by glyph index directly. - get_glyph_index_name (glyph_name, pg); - } - + // Access by glyph index directly. + get_glyph_index_name (glyph_name, pg); + if (glyph_name[0] == '\0') { - /* - CID entry - */ + // CID entry cid_keyed = true; char_id = scm_from_uint32 (pg); } else char_id = scm_from_locale_string (glyph_name); - + *tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_), scm_from_double (ggeo.x_offset * scale_), scm_from_double (ggeo.y_offset * scale_), - char_id), SCM_EOL); tail = SCM_CDRLOC (*tail); } - pango_glyph_string_free (pgs); + pango_glyph_string_free (pgs); pgs = 0; PangoFontDescription *descr = pango_font_describe (pa->font); Real size = pango_font_description_get_size (descr) - / (Real (PANGO_SCALE)); - + / (Real (PANGO_SCALE)); if (!ps_name_str0) warning (_f ("no PostScript font name for font `%s'", file_name)); @@ -234,8 +233,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, && (file_name.find (".otf") != NPOS || file_name.find (".cff") != NPOS)) { - - /* UGH: kludge a PS name for OTF/CFF fonts. */ + // UGH: kludge a PS name for OTF/CFF fonts. string name = file_name; ssize idx = file_name.find (".otf"); if (idx == NPOS) @@ -246,11 +244,11 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, ssize slash_idx = name.rfind ('/'); if (slash_idx != NPOS) { - slash_idx ++; + slash_idx ++; name = name.substr (slash_idx, name.length () - slash_idx); } - + string initial = name.substr (0, 1); initial = String_convert::to_upper (initial); name = name.substr (1, name.length () - 1); @@ -262,7 +260,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, if (ps_name.length ()) { - ((Pango_font *) this)->register_font_file (file_name, ps_name); + ((Pango_font *) this)->register_font_file (file_name, + ps_name, + face_index); pango_fc_font_unlock_face (fcfont); SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"), @@ -284,13 +284,12 @@ Pango_font::physical_font_tab () const return physical_font_tab_; } - Stencil Pango_font::word_stencil (string str) const { return text_stencil (str, true); } - + Stencil Pango_font::text_stencil (string str) const { @@ -298,7 +297,8 @@ Pango_font::text_stencil (string str) const } Stencil -Pango_font::text_stencil (string str, bool tight) const +Pango_font::text_stencil (string str, + bool tight) const { GList *items = pango_itemize (context_, @@ -317,7 +317,7 @@ Pango_font::text_stencil (string str, bool tight) const if (item->analysis.level == PANGO_DIRECTION_RTL) text_dir = LEFT; } - + for (GList *ptr = items; ptr; ptr = ptr->next) { PangoItem *item = (PangoItem *) ptr->data; @@ -330,11 +330,9 @@ Pango_font::text_stencil (string str, bool tight) const last_x = item_stencil.extent (X_AXIS)[RIGHT]; } else if (text_dir == LEFT) - { - dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); - } + dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); -#if 0 /* Check extents. */ +#if 0 // Check extents. if (!item_stencil.extent_box ()[X_AXIS].is_empty ()) { Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1); @@ -344,24 +342,19 @@ Pango_font::text_stencil (string str, bool tight) const dest.add_stencil (frame); } #endif - + dest.add_stencil (item_stencil); } - /* - UGH. Should have flags per output format signifying supported - options. - */ + // UGH. Should have flags per output format signifying supported + // options. string name = get_output_backend_name (); if (name != "ps" && name != "eps") { - /* - For Pango based backends, we take a shortcut. - */ - SCM exp - = scm_list_3 (ly_symbol2scm ("utf-8-string"), - ly_string2scm (description_string ()), - ly_string2scm (str)); + // For Pango based backends, we take a shortcut. + SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"), + ly_string2scm (description_string ()), + ly_string2scm (str)); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); @@ -382,11 +375,10 @@ Pango_font::description_string () const return s; } - SCM Pango_font::font_file_name () const { return SCM_BOOL_F; } -#endif +#endif // HAVE_PANGO_FT2 diff --git a/lily/paper-book.cc b/lily/paper-book.cc index ea4424c86e..7b43799e99 100644 --- a/lily/paper-book.cc +++ b/lily/paper-book.cc @@ -128,7 +128,7 @@ Paper_book::output_aux (SCM output_channel, if (scm_is_pair (bookparts_)) { - for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) { bool is_last_part = (is_last && !scm_is_pair (scm_cdr (p))); @@ -521,7 +521,7 @@ Paper_book::systems () systems_ = SCM_EOL; if (scm_is_pair (bookparts_)) { - for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) systems_ = scm_append_x (scm_list_2 (systems_, pbookpart->systems ())); } @@ -581,7 +581,7 @@ Paper_book::pages () pages_ = SCM_EOL; if (scm_is_pair (bookparts_)) { - for (SCM p = scm_reverse (bookparts_); scm_is_pair (p); p = scm_cdr (p)) + for (SCM p = bookparts_; scm_is_pair (p); p = scm_cdr (p)) if (Paper_book *pbookpart = unsmob_paper_book (scm_car (p))) pages_ = scm_append_x (scm_list_2 (pages_, pbookpart->pages ())); } diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 5f02a76549..d3b99055e9 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -55,9 +55,10 @@ Paper_outputter::mark_smob (SCM x) } int -Paper_outputter::print_smob (SCM x, SCM p, scm_print_state*) +Paper_outputter::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - (void) x; scm_puts ("#", p); return 1; } diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index f55be9829d..409ba88945 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -38,9 +38,6 @@ internal_ly_parse_scm (Parse_start *ps) SCM answer = SCM_UNSPECIFIED; SCM form = scm_read (port); - /* Reset read_buf for scm_ftell. - Shouldn't scm_read () do this for us? */ - scm_fill_input (port); SCM to = scm_ftell (port); ps->nchars = scm_to_int (to) - scm_to_int (from); diff --git a/lily/prob.cc b/lily/prob.cc index e55e84afc1..9d75d744f3 100644 --- a/lily/prob.cc +++ b/lily/prob.cc @@ -174,10 +174,9 @@ Prob::internal_set_property (SCM sym, SCM val) } void -Prob::type_check_assignment (SCM sym, SCM val) const +Prob::type_check_assignment (SCM, SCM) const { - (void) sym; - (void) val; + /* empty */ } SCM diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index bf6116ab17..8d677c425b 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -19,9 +19,9 @@ public: MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2) SCM -Relative_octave_music::no_relative_callback (SCM music, SCM pitch) +Relative_octave_music::no_relative_callback (SCM /* music */, + SCM pitch) { - (void)music; return pitch; } diff --git a/lily/rest.cc b/lily/rest.cc index da13f6cdbc..9caae1f5e9 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -193,11 +193,10 @@ Rest::generic_extent_callback (Grob *me, Axis a) MAKE_SCHEME_CALLBACK (Rest, pure_height, 3); SCM -Rest::pure_height (SCM smob, SCM start, SCM end) +Rest::pure_height (SCM smob, + SCM /* start */, + SCM /* end */) { - (void) start; - (void) end; - Grob *me = unsmob_grob (smob); SCM m = brew_internal_stencil (me, false); return ly_interval2scm (unsmob_stencil (m)->extent (Y_AXIS)); diff --git a/lily/scale.cc b/lily/scale.cc index 9e39d8a99e..99cd6d91db 100644 --- a/lily/scale.cc +++ b/lily/scale.cc @@ -57,8 +57,8 @@ LY_DEFINE (ly_default_scale, "ly:default-scale", "Get the global default scale.") { return default_global_scale - ? SCM_BOOL_F - : default_global_scale->self_scm (); + ? default_global_scale->self_scm () + : SCM_BOOL_F; } @@ -121,19 +121,17 @@ Scale::normalize_step (int step) const } int -Scale::print_smob (SCM x, SCM port, scm_print_state *) +Scale::print_smob (SCM /* x */, + SCM port, + scm_print_state *) { - (void) x; - scm_puts ("#", port); return 1; } - SCM -Scale::mark_smob (SCM x) +Scale::mark_smob (SCM) { - (void) x; return SCM_UNSPECIFIED; } diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index ed3345b5ac..d3a8d7f9bd 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -120,9 +120,11 @@ Scheme_hash_table::remove (SCM k) } static SCM -collect_handles (void *closure, SCM key, SCM value, SCM result) +collect_handles (void * /* closure */, + SCM key, + SCM value, + SCM result) { - (void) closure; return scm_acons(key, value, result); } diff --git a/lily/skyline.cc b/lily/skyline.cc index 6e64a2c96b..78c4e8cde0 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -7,6 +7,7 @@ #include "skyline.hh" #include +#include #include "ly-smobs.icc" diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc index 7545ec4e5b..40e0a16b4a 100644 --- a/lily/spacing-basic.cc +++ b/lily/spacing-basic.cc @@ -83,11 +83,11 @@ get_measure_length (Grob *column) } Real -Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc, +Spacing_spanner::note_spacing (Grob * /* me */, + Grob *lc, + Grob *rc, Spacing_options const *options) { - (void) me; - Moment shortest_playing_len = 0; SCM s = lc->get_property ("shortest-playing-duration"); diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc index ae4533cc21..a50c4bf92f 100644 --- a/lily/spring-smob.cc +++ b/lily/spring-smob.cc @@ -13,10 +13,8 @@ IMPLEMENT_SIMPLE_SMOBS (Spring); SCM -Spring::mark_smob (SCM x) +Spring::mark_smob (SCM) { - (void)x; - return SCM_UNSPECIFIED; } diff --git a/lily/stem.cc b/lily/stem.cc index 1f8b21e85f..3380d0cc17 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -229,11 +229,10 @@ Stem::is_normal_stem (Grob *me) MAKE_SCHEME_CALLBACK (Stem, pure_height, 3) SCM -Stem::pure_height (SCM smob, SCM start, SCM end) +Stem::pure_height (SCM smob, + SCM /* start */, + SCM /* end */) { - (void) start; - (void) end; - Grob *me = unsmob_grob (smob); Interval iv; diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index dbbf1074a1..ba064bcd3d 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -7,6 +7,7 @@ */ +#include #include "tie-formatting-problem.hh" #include "axis-group-interface.hh" diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc index 4298ffedaf..5a6ce4a0a6 100644 --- a/lily/translator-dispatch-list.cc +++ b/lily/translator-dispatch-list.cc @@ -63,16 +63,16 @@ Engraver_dispatch_list::create (SCM trans_list, } SCM -Engraver_dispatch_list::mark_smob (SCM x) +Engraver_dispatch_list::mark_smob (SCM) { - (void)x; return SCM_BOOL_F; } int -Engraver_dispatch_list::print_smob (SCM x, SCM p, scm_print_state *) +Engraver_dispatch_list::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - (void)x; scm_puts ("#", p); return 1; } diff --git a/lily/ttf.cc b/lily/ttf.cc index 2008c1d532..41363880c9 100644 --- a/lily/ttf.cc +++ b/lily/ttf.cc @@ -6,10 +6,12 @@ (c) 2005--2008 Han-Wen Nienhuys */ +#include #include "freetype.hh" #include +#include "international.hh" #include "memory-stream.hh" #include "warn.hh" #include "lily-guile.hh" @@ -453,9 +455,24 @@ print_trailer (void *out, } static void -create_type42_font (void *out, string name) +create_type42_font (void *out, string name, int idx) { - FT_Face face = open_ft_face (name); + FT_Face face; + + /* check whether font index is valid */ + if (idx > 0) + { + face = open_ft_face (name, -1); + if (idx >= face->num_faces) + { + warning (_f ("font index %d too large for font `%s', using index 0", + idx, name.c_str())); + idx = 0; + } + FT_Done_Face (face); + } + + face = open_ft_face (name, idx); print_header (out, face); print_body (out, face); @@ -464,20 +481,49 @@ create_type42_font (void *out, string name) FT_Done_Face (face); } - LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name", - 1, 0, 0, (SCM ttf_file_name), - "Extract the PostScript name from a TrueType font.") + 1, 1, 0, (SCM ttf_file_name, SCM idx), + "Extract the PostScript name from a TrueType font. The optional" + " @var{idx} argument is useful for TrueType collections (TTC)" + " only; it specifies the font index within the TTC. The default" + " value of @var{idx} is@tie{}0.") { LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1); + + int i = 0; + if (idx != SCM_UNDEFINED) + { + LY_ASSERT_TYPE (scm_is_integer, idx, 2); + i = scm_to_int (idx); + if (i < 0) + { + warning (_ ("font index must be non-negative, using index 0")); + i = 0; + } + } + string file_name = ly_scm2string (ttf_file_name); if (be_verbose_global) progress_indication ("[" + file_name); - FT_Face face = open_ft_face (file_name); + FT_Face face; + + /* check whether font index is valid */ + if (i > 0) + { + face = open_ft_face (file_name, -1); + if (i >= face->num_faces) + { + warning (_f ("font index %d too large for font `%s', using index 0", + i, file_name.c_str())); + i = 0; + } + FT_Done_Face (face); + } + + face = open_ft_face (file_name, i); char const *ps_name_str0 = FT_Get_Postscript_Name (face); SCM ps_name = scm_from_locale_string (ps_name_str0 ? ps_name_str0 : ""); - FT_Done_Face (face); if (be_verbose_global) @@ -486,22 +532,35 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name", return ps_name; } - - LY_DEFINE (ly_ttf_2_pfa, "ly:ttf->pfa", - 1, 0, 0, (SCM ttf_file_name), - "Convert the contents of a TTF file to Type42 PFA, returning it as" - " a string.") + 1, 1, 0, (SCM ttf_file_name, SCM idx), + "Convert the contents of a TrueType font file to PostScript" + " Type@tie{}42 font, returning it as a string. The optional" + " @var{idx} argument is useful for TrueType collections (TTC)" + " only; it specifies the font index within the TTC. The default" + " value of @var{idx} is@tie{}0.") { LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1); + int i = 0; + if (idx != SCM_UNDEFINED) + { + LY_ASSERT_TYPE (scm_is_integer, idx, 2); + i = scm_to_int (idx); + if (i < 0) + { + warning (_ ("font index must be non-negative, using index 0")); + i = 0; + } + } + string file_name = ly_scm2string (ttf_file_name); if (be_verbose_global) progress_indication ("[" + file_name); Memory_out_stream stream; - create_type42_font (&stream, file_name); + create_type42_font (&stream, file_name, i); SCM asscm = scm_from_locale_stringn (stream.get_string (), stream.get_length ()); diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly index 17007c2fc4..93711b1c71 100644 --- a/ly/Welcome-to-LilyPond-MacOS.ly +++ b/ly/Welcome-to-LilyPond-MacOS.ly @@ -23,7 +23,7 @@ That's it. For more information, visit http://lilypond.org . %} -\version "2.11.65" % necessary for upgrading to future LilyPond versions. +\version "2.12.0" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly index 69910760e4..bfe7231ee0 100644 --- a/ly/Welcome_to_LilyPond.ly +++ b/ly/Welcome_to_LilyPond.ly @@ -27,7 +27,7 @@ LilyPond's interface is text-based. Please read the documentation. For more information, visit http://lilypond.org . %} -\version "2.11.65" % necessary for upgrading to future LilyPond versions. +\version "2.12.0" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/ly/arabic.ly b/ly/arabic.ly index 24017211a4..1a4273871a 100644 --- a/ly/arabic.ly +++ b/ly/arabic.ly @@ -1,4 +1,4 @@ -\version "2.11.51" +\version "2.12.0" \include "italiano.ly" %%%%%%% diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly index 3ed668ce8e..07c39a9bcd 100644 --- a/ly/bagpipe.ly +++ b/ly/bagpipe.ly @@ -9,7 +9,7 @@ $Id: bagpipe.ly,v 1.12 2006/03/16 14:39:46 hanwen Exp $ %} -\version "2.10.0" +\version "2.12.0" % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. % Flat notes used mainly in some modern music. diff --git a/ly/catalan.ly b/ly/catalan.ly index 7d5ae8164a..aab7edf923 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -74,6 +74,6 @@ pitchnamesCatalan = #`( pitchnames = \pitchnamesCatalan -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 9eb3d8cb8f..98b11b6752 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" chordmodifiers = #default-chord-modifier-list diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 20fbce4523..f822e0f3de 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" %% < 1.8 compatibility switch #(ly:set-option 'old-relative) @@ -31,10 +31,10 @@ bigger = #1 center = #0 %% FIXME -%% should also set allowBeamBreak, but how to do it "portably"? (ie. also +%% should also set \override Beam #'breakable, but how to do it "portably"? (ie. also %% working with lyric sections) %% -%% try \once \set Score.allowBeamBreak = ##t +%% try \once \override Score.Beam #'breakable = ##t %% rather name \newline, \pageBreak ? break = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission 'force))) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 747fd52921..0967f4cad2 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -84,6 +84,6 @@ pitchnamesDeutsch = #`( pitchnames = \pitchnamesDeutsch -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 70f3c87fa0..6574a76258 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.12.0" drumPitchNames = #'((acousticbassdrum . acousticbassdrum) diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index fdbc03fb01..a29430f158 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index 4f7983c7a4..fec9b11aee 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -129,7 +129,7 @@ pitchnamesEnglish = #`( pitchnames = \pitchnamesEnglish -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 7688912f6a..0c5b7e6db5 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" \context { \name "Global" @@ -534,7 +534,6 @@ automatically when an output definition (a @code{\score} or markFormatter = #format-mark-letters rehearsalMark = #1 subdivideBeams = ##f - allowBeamBreak = ##f extraNatural = ##t autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0)) autoCautionaries = #'() @@ -782,7 +781,7 @@ of Editio Vaticana." clefOctavation = #0 %% Select vaticana style font. - \override KeySignature #'style = #'vaticana + \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist \override Custos #'style = #'vaticana \override Custos #'neutral-position = #3 @@ -885,7 +884,7 @@ accommodated for typesetting a piece in mensural style." %% Select mensural style font. \override TimeSignature #'style = #'mensural - \override KeySignature #'style = #'mensural + \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 diff --git a/ly/espanol.ly b/ly/espanol.ly index 760ec8407a..90305f603e 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,6 +58,6 @@ pitchnamesEspanol = #`( pitchnames = \pitchnamesEspanol -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/festival.ly b/ly/festival.ly index f77b48f8e5..66313e3f99 100644 --- a/ly/festival.ly +++ b/ly/festival.ly @@ -20,7 +20,7 @@ % along with this program; if not, write to the Free Software % Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -\version "2.11.11" +\version "2.12.0" #(use-modules (scm song)) diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index a28da00378..c6b236d5c5 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % % Running LilyPond on this file generates the documentation diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index b7e2ec1a97..20668317a1 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/grace-init.ly b/ly/grace-init.ly index daea9d33c2..ea89bb2e4e 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" startGraceMusic = { diff --git a/ly/graphviz-init.ly b/ly/graphviz-init.ly index cae11b1a29..12330a345f 100644 --- a/ly/graphviz-init.ly +++ b/ly/graphviz-init.ly @@ -1,4 +1,4 @@ -\version "2.11.15" +\version "2.12.0" #(use-modules (scm graphviz)) diff --git a/ly/gregorian.ly b/ly/gregorian.ly index f2b6e55bfc..496e0b6717 100644 --- a/ly/gregorian.ly +++ b/ly/gregorian.ly @@ -3,7 +3,7 @@ $Id$ %} -\version "2.10.0" +\version "2.12.0" % % Declare memorable shortcuts for special unicode characters diff --git a/ly/init.ly b/ly/init.ly index 5a2103e83c..d1923659f9 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -4,7 +4,7 @@ #(if (and #t (defined? 'set-debug-cell-accesses!)) (set-debug-cell-accesses! 5000)) -\version "2.10.0" +\version "2.12.0" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 13c4c17634..c22292b827 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -86,6 +86,6 @@ pitchnamesItaliano = #`( pitchnames = \pitchnamesItaliano -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/lilypond-book-preamble.ly b/ly/lilypond-book-preamble.ly index a7bea92f15..e6e72503eb 100644 --- a/ly/lilypond-book-preamble.ly +++ b/ly/lilypond-book-preamble.ly @@ -1,5 +1,5 @@ -\version "2.10.0" +\version "2.12.0" %% toplevel \book gets output per page, %% everything else gets output per system/title diff --git a/ly/makam.ly b/ly/makam.ly index 68cd7d7bc9..c7f793d267 100644 --- a/ly/makam.ly +++ b/ly/makam.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" %{ diff --git a/ly/markup-init.ly b/ly/markup-init.ly index 49c155c94e..5749c7bb8f 100644 --- a/ly/markup-init.ly +++ b/ly/markup-init.ly @@ -1,6 +1,6 @@ %% -*- Mode: Scheme -*- -\version "2.11.9" +\version "2.12.0" %%;; to be define later, in a closure #(define-public toplevel-module-define-public! #f) diff --git a/ly/midi-init.ly b/ly/midi-init.ly index 7a6166afae..3ba3651f06 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" \midi { \include "performer-init.ly" } diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 10af2cfefb..a112b67e64 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -1,6 +1,6 @@ % -*-Scheme-*- -\version "2.10.0" +\version "2.12.0" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/ly/nederlands.ly b/ly/nederlands.ly index eed065349f..9a1eaab774 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" %{ common dutch names for notes. es means flat, is means sharp diff --git a/ly/norsk.ly b/ly/norsk.ly index 76db0ec2cc..5b02889ab4 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -105,6 +105,6 @@ pitchnamesNorsk = #`( pitchnames =\pitchnamesNorsk -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly index cac75ecb73..9d2725ede0 100644 --- a/ly/paper-defaults-init.ly +++ b/ly/paper-defaults-init.ly @@ -1,4 +1,4 @@ -\version "2.11.11" +\version "2.12.0" #(use-modules (scm layout-page-layout)) \paper { diff --git a/ly/params-init.ly b/ly/params-init.ly index 9c877d233a..2c0e87eae9 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,2 +1,2 @@ -\version "2.10.0" +\version "2.12.0" diff --git a/ly/performer-init.ly b/ly/performer-init.ly index b48bd5454d..3803396b20 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" %% %% setup for Request->Element conversion. diff --git a/ly/portugues.ly b/ly/portugues.ly index 1444d25771..4810c85548 100644 --- a/ly/portugues.ly +++ b/ly/portugues.ly @@ -86,6 +86,6 @@ pitchnamesPortuguese = #`( pitchnames = \pitchnamesPortuguese -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly index a5d62e1a66..df88ee79bf 100644 --- a/ly/predefined-fretboards-init.ly +++ b/ly/predefined-fretboards-init.ly @@ -4,7 +4,7 @@ %%%% %%%% (c) 2008 Carl D. Sorensen -\version "2.11.65" +\version "2.12.0" % chord-shape-table is a hash-table of chord shapes % in the form of diagram-descriptions that can be diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly index 5ff9ab312b..84244b257c 100644 --- a/ly/predefined-guitar-fretboards.ly +++ b/ly/predefined-guitar-fretboards.ly @@ -6,7 +6,7 @@ %%% Add basic chordshapes -\version "2.11.56" +\version "2.12.0" \addChordShape #'f #guitar-tuning #"1-1-(;3-3;3-4;2-2;1-1;1-1-);" \addChordShape #'f:m #guitar-tuning #"1-1-(;3-3;3-4;1-1;1-1;1-1-);" diff --git a/ly/predefined-guitar-ninth-fretboards.ly b/ly/predefined-guitar-ninth-fretboards.ly index 179b8bad84..fc0530f93b 100644 --- a/ly/predefined-guitar-ninth-fretboards.ly +++ b/ly/predefined-guitar-ninth-fretboards.ly @@ -1,4 +1,4 @@ -\version "2.11.61" +\version "2.12.0" % % Add ninth chords to to predefined fret diagrams for standard guitar tunings % diff --git a/ly/property-init.ly b/ly/property-init.ly index 8f4a2e3366..2d50a6c601 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.11.53" +\version "2.12.0" stemUp = \override Stem #'direction = #UP stemDown = \override Stem #'direction = #DOWN diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index c462deb82d..4500920249 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" major = #`( diff --git a/ly/script-init.ly b/ly/script-init.ly index ab96dad9f1..d1d28a54af 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "2.10.0" +\version "2.12.0" % code char abbreviations diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 28c4574019..7b26094e49 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "2.11.52" +\version "2.12.0" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) diff --git a/ly/suomi.ly b/ly/suomi.ly index 153281e413..10e1cbf8cb 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -49,6 +49,6 @@ pitchnamesSuomi = #`( pitchnames = \pitchnamesSuomi -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/svenska.ly b/ly/svenska.ly index ee341ac76c..260638994f 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -42,6 +42,6 @@ pitchnamesSvenska = #`( ) pitchnames = \pitchnamesSvenska -\version "2.10.0" +\version "2.12.0" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/titling-init.ly b/ly/titling-init.ly index 08b23d469d..60c07e6ef0 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -1,4 +1,4 @@ -\version "2.11.57" +\version "2.12.0" slashSeparator = \markup { \center-align diff --git a/ly/toc-init.ly b/ly/toc-init.ly index 334c983d0b..068563abf7 100644 --- a/ly/toc-init.ly +++ b/ly/toc-init.ly @@ -1,4 +1,4 @@ -\version "2.11.26" +\version "2.12.0" %% defined later, in a closure #(define-public (add-toc-item! markup-symbol text) diff --git a/ly/vlaams.ly b/ly/vlaams.ly index 37d9a91271..eb35589af4 100644 --- a/ly/vlaams.ly +++ b/ly/vlaams.ly @@ -1,4 +1,4 @@ -\version "2.10.0" %hier stond 2.1.36, mocht ik dat wel veranderen? +\version "2.12.0" %hier stond 2.1.36, mocht ik dat wel veranderen? %{ diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 729dd1d6ce..f593c6f36f 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -247,6 +247,45 @@ fet_beginchar ("64th Flag (up)", "u6"); fet_endchar; +fet_beginchar ("128th Flag (up)", "u7"); + save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; + save flagspace, total_depth, flag_count; + + flag_count = 5; + flare = .85 staff_space; + flagspace# = .93 staff_space#; + hip_depth_ratio = .72; + hip_width# = upflag_width# - hip_thickness# / 2; + total_depth# = 6.25 staff_space#; + foot_width_ratio = .8; + + (flag_count - 1) * flagspace# + foot_depth# = total_depth#; + + define_pixels (hip_width, foot_depth); + define_whole_vertical_pixels (flagspace); + + set_char_box (0, hip_width# + right_upflag_space#, + total_depth# + foot_thickness# / 2, stemthickness# / 2); + + draw_flag ((0, -(flag_count - 1) * flagspace), flare, + (hip_width, foot_depth), + hip_depth_ratio, foot_width_ratio, + hip_thickness, foot_thickness, 1); + + add_flag (flagspace, flare, .97, 1.00, 1.3, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, 1.00, 1.00, 1.25, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, 1.00, 1.00, 1.25, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, 0.95, 1.05, 1.25, + hip_thickness, foot_thickness); + + draw_square_block ((-0.5 stemthickness_rounded, 0), + (0, -5 staff_space_rounded)); +fet_endchar; + + fet_beginchar ("8th (down)", "d3"); save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; @@ -468,4 +507,44 @@ fet_beginchar ("64th (down)", "d6"); y_mirror_char; fet_endchar; + +fet_beginchar ("128th (down)", "d7"); + save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; + save flagspace, total_depth, flag_count; + + flag_count = 5; + flare = .8 staff_space; + flagspace# = .9 staff_space#; + hip_depth_ratio = .85; + hip_width# = downflag_width# - hip_thickness# / 2; + total_depth# = 5.25 staff_space#; + foot_width_ratio = .98; + + (flag_count - 1) * flagspace# + foot_depth# = total_depth#; + define_pixels (hip_width, foot_depth); + define_whole_vertical_pixels (flagspace); + + set_char_box (0, hip_width# + right_downflag_space#, + total_depth# + foot_thickness# / 2, stemthickness# / 2); + + draw_flag ((0, -(flag_count - 1) * flagspace), flare, + (hip_width, foot_depth), + hip_depth_ratio, foot_width_ratio, + hip_thickness, foot_thickness, 0); + + add_flag (flagspace, flare, .97, 1.20, 1.175, + hip_thickness, foot_thickness); + add_flag (flagspace, flare, .97, 1.10, 1.175, + hip_thickness, foot_thickness); + add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + hip_thickness, foot_thickness); + add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + hip_thickness, foot_thickness); + + draw_square_block ((-0.5 stemthickness_rounded, 0), + (0, -5 staff_space_rounded)); + + y_mirror_char; +fet_endchar; + fet_endgroup ("flags"); diff --git a/python/convertrules.py b/python/convertrules.py index f86165c477..8aa8d29553 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2820,7 +2820,7 @@ def conv (str): @rule ((2, 11, 62), "makam-init.ly -> makam.ly, \\bigger -> \\larger") def conv (str): str = re.sub (r'\\include(\s+)"makam-init.ly"', r'\\include\1"makam.ly"', str) - str = re.sub (r"\\bigger", r"\\larger", str) + str = re.sub (r"([\\:])bigger", r"\1larger", str) return str @rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup,\n\ @@ -2844,7 +2844,9 @@ def conv (str): str = re.sub ('InnerChoirStaff', 'ChoirStaff', str) return str -@rule ((2, 11, 66), "Syntax changes for \\addChordShape and \\chord-shape") +@rule ((2, 12, 0), + _ ("Syntax changes for \\addChordShape and \\chord-shape") + "\n" + \ + _ ("bump version for release")) def conv(str): if re.search(r'\\addChordShape', str): stderr_write ("\n") diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index 3b42e08b37..d45150f10f 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -162,14 +162,15 @@ Should be set for staves.") (crescendoText ,markup? "The text to print at start of non-hairpin crescendo, i.e., @samp{cresc.}.") (crescendoSpanner ,symbol? "The type of spanner to be used for -crescendi. Available values are @samp{hairpin}, @samp{line}, -@samp{dashed-line}, @samp{dotted-line}. If unset, a hairpin crescendo -is used.") +crescendi. Available values are @samp{hairpin} and @samp{text}. If unset, +a hairpin crescendo is used.") (currentBarNumber ,integer? "Contains the current barnumber. This property is incremented at every bar line.") - (decrescendoSpanner ,symbol? "See @code{crescendoSpanner}.") + (decrescendoSpanner ,symbol? "The type of spanner to be used for +decrescendi. Available values are @samp{hairpin} and @samp{text}. If +unset, a hairpin decrescendo is used.") (decrescendoText ,markup? "The text to print at start of non-hairpin decrescendo, i.e., @samp{dim.}.") (defaultBarType ,string? "Set the default type of bar line. See diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 00cb1ebcf6..2eda0539ce 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -133,6 +133,8 @@ stick out of its bounds?") (c0-position ,integer? "An integer indicating the position of middle@tie{}C.") + (circled-tip ,boolean? "Put a circle at start/end of hairpins (al/del +niente).") (clip-edges ,boolean? "Allow outward pointing beamlets at the edges of beams?") (collapse-height ,ly:dimension? "Minimum height of system start @@ -500,6 +502,8 @@ In case of a potential collision, the grob with the smaller tightly as possible.") (padding ,ly:dimension? "Add this much extra space between objects that are next to each other.") + (padding-pairs ,list? "An alist mapping @code{(@var{name} . @var{name})} +to distances.") (page-break-penalty ,number? "Penalty for page break at this column. This affects the choices of the page breaker; it avoids a page break at a column with a positive penalty and prefers a page break @@ -577,6 +581,11 @@ is placed vertically.") @code{direction-source} with this to get the direction of this object.") (size ,number? "Size of object, relative to standard size.") + (skyline-horizontal-padding ,number? "For determining the vertical +distance between two staves, it is possible to have a configuration which +would result in a tight interleaving of grobs from the top staff and the +bottom staff. The larger this parameter is, the farther apart the staves +are placed in such a configuration.") (slash-negative-kern ,number? "The space to remove between slashes in percent repeat glyphs. Larger values bring the two elements closer together.") @@ -765,9 +774,6 @@ columns.") (note-columns ,pair? "A list of @code{NoteColumn} grobs.") (note-head ,ly:grob? "A single note head.") (note-heads ,ly:grob-array? "A list of note head grobs.") - - (padding-pairs ,list? "An alist mapping @code{(@var{name} . @var{name})} -to distances.") (pedal-text ,ly:grob? "A pointer to the text of a mixed-style piano pedal.") (pure-Y-common ,ly:grob? "A cache of the @@ -811,9 +817,6 @@ that should only show changes.") (cause ,scheme? "Any kind of causation objects (i.e., music, or perhaps translator) that was the cause for this grob.") - (circled-tip ,boolean? "Put a circle at start/end of hairpins (al/del -niente).") - (delta-position ,number? "The vertical position difference.") (details ,list? "Alist of parameters for detailed grob behavior. @@ -856,11 +859,6 @@ acts as an index for looking up a @code{Stencil} object.") Internally used to distribute beam shortening over stems.") (skyline-distance ,number? "The distance between this staff and the next one, as determined by a skyline algorithm.") - (skyline-horizontal-padding ,number? "For determining the vertical -distance between two staves, it is possible to have a configuration which -would result in a tight interleaving of grobs from the top staff and the -bottom staff. The larger this parameter is, the farther apart the staves -are placed in such a configuration.") (stem-info ,pair? "A cache of stem parameters.") (use-breve-rest ,boolean? "Use breve rests for measures longer diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 4009f6ebdf..c7059d0ff3 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1641,8 +1641,8 @@ (details . ( ;; 3.5 (or 3 measured from note head) is standard length - ;; 32nd, 64th flagged stems should be longer - (lengths . (3.5 3.5 3.5 4.5 5.0)) + ;; 32nd, 64th, 128th flagged stems should be longer + (lengths . (3.5 3.5 3.5 4.5 5.0 6.0)) ;; FIXME. 3.5 yields too long beams (according to Ross and ;; looking at Baerenreiter examples) for a number of common diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 58026ff726..cfd72cf041 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -27,7 +27,6 @@ (define-public (ps-font-command font) (let* ((name (ly:font-file-name font)) (magnify (ly:font-magnification font))) - (string-append "magfont" (ly:string-substitute @@ -40,24 +39,27 @@ (define (define-fonts paper) (define font-list (ly:paper-fonts paper)) + (define (define-font command fontname scaling) (string-append - "/" command " { /" fontname " " (ly:number->string scaling) " output-scale div selectfont } bind def\n")) + "/" command + " { /" fontname + " " (ly:number->string scaling) " output-scale div selectfont }" + " bind def\n")) (define (font-load-command font) (let* ((specced-font-name (ly:font-name font)) (fontname (if specced-font-name - specced-font-name + specced-font-name (ly:font-file-name font))) (command (ps-font-command font)) - ;; FIXME -- see (ps-font-command ) + ;; FIXME -- see (ps-font-command) (plain (ps-font-command font)) (designsize (ly:font-design-size font)) (magnification (* (ly:font-magnification font))) (ops (ly:output-def-lookup paper 'output-scale)) (scaling (* ops magnification designsize))) - (if (equal? fontname "unknown") (display (list font fontname))) (define-font plain fontname scaling))) @@ -85,15 +87,13 @@ (string-append "/lily-output-units " - (number->string (/ (ly:bp 1))) - " def %% millimeter\n" + (number->string (/ (ly:bp 1))) " def %% millimeter\n" (output-entry "staff-line-thickness" 'line-thickness) (output-entry "line-width" 'line-width) (output-entry "paper-size" 'papersizename) (output-entry "staff-height" 'staff-height) ;junkme. "/output-scale " - (number->string (ly:output-def-lookup layout 'output-scale)) - " def\n" + (number->string (ly:output-def-lookup layout 'output-scale)) " def\n" (output-entry "page-height" 'paper-height) (output-entry "page-width" 'paper-width))) @@ -107,11 +107,9 @@ "page-width output-scale lily-output-units mul mul 0 translate 90 rotate\n" "") "%%EndPageSetup\n" - + "\n" "true setstrokeadjust\n" - "gsave 0 paper-height translate " - "set-ps-scale-to-lily-scale " - "\n")) + "gsave 0 paper-height translate set-ps-scale-to-lily-scale\n")) (ly:outputter-dump-stencil outputter page) (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n")) @@ -119,94 +117,85 @@ (define (extract-names font) (if (ly:pango-font? font) (map car (ly:pango-font-physical-fonts font)) - (list (ly:font-name font)))) + (list (ly:font-name font)))) (let* ((fonts (ly:paper-fonts paper)) (names (apply append (map extract-names fonts)))) - (apply string-append (map (lambda (f) (format (if load-fonts? - "%%DocumentSuppliedResources: font ~a\n" - "%%DocumentNeededResources: font ~a\n") + "%%DocumentSuppliedResources: font ~a\n" + "%%DocumentNeededResources: font ~a\n") f)) (uniq-list (sort names stringstring bbox) " ") "\n" + (string-join (map ly:number->string bbox) " ") "\n" "%%Orientation: " - (if (eq? (ly:output-def-lookup paper 'landscape) #t) - "Landscape\n" - "Portrait\n") + (if (eq? (ly:output-def-lookup paper 'landscape) #t) + "Landscape\n" + "Portrait\n") (supplies-or-needs paper load-fonts?) "%%EndComments\n")) -(define (ps-document-media paper) - (let* ((w (/ (* - (ly:output-def-lookup paper 'output-scale) - (ly:output-def-lookup paper 'paper-width)) (ly:bp 1))) - (h (/ (* - (ly:output-def-lookup paper 'paper-height) - (ly:output-def-lookup paper 'output-scale)) - (ly:bp 1))) - (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))) - (ly:format "%%DocumentMedia: ~a ~2f ~2f ~a ~a ~a\n" - (ly:output-def-lookup paper 'papersizename) - (if landscape? h w) - (if landscape? w h) - 80 ;; weight - "()" ;; color - "()" ;; type - ))) - +(define (ps-document-media paper) + (let* ((w (/ (* + (ly:output-def-lookup paper 'output-scale) + (ly:output-def-lookup paper 'paper-width)) (ly:bp 1))) + (h (/ (* + (ly:output-def-lookup paper 'paper-height) + (ly:output-def-lookup paper 'output-scale)) + (ly:bp 1))) + (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))) + (ly:format "%%DocumentMedia: ~a ~2f ~2f ~a ~a ~a\n" + (ly:output-def-lookup paper 'papersizename) + (if landscape? h w) + (if landscape? w h) + 80 ;; weight + "()" ;; color + "()" ;; type + ))) (define (file-header paper page-count load-fonts?) (string-append "%!PS-Adobe-3.0\n" - "%%Creator: LilyPond " - (lilypond-version) - "\n" - + "%%Creator: LilyPond " (lilypond-version) "\n" "%%Pages: " (number->string page-count) "\n" "%%PageOrder: Ascend\n" "%%Orientation: " - (if (eq? (ly:output-def-lookup paper 'landscape) #t) - "Landscape\n" - "Portrait\n") + (if (eq? (ly:output-def-lookup paper 'landscape) #t) + "Landscape\n" + "Portrait\n") (ps-document-media paper) (supplies-or-needs paper load-fonts?) "%%EndComments\n")) (define (procset file-name) (format - "%%BeginResource: procset (~a) 1 0 + "%%BeginResource: procset (~a) 1 0 ~a %%EndResource " - file-name (cached-file-contents file-name))) + file-name (cached-file-contents file-name))) (define (embed-document file-name) (format "%%BeginDocument: ~a ~a %%EndDocument -" - file-name (cached-file-contents file-name))) +" + file-name (cached-file-contents file-name))) (define (setup-variables paper) (string-append "\n" (define-fonts paper) - (output-variables paper) - )) + (output-variables paper))) (define (cff-font? font) - (let* - ((cff-string (ly:otf-font-table-data font "CFF "))) + (let* ((cff-string (ly:otf-font-table-data font "CFF "))) (> (string-length cff-string) 0))) (define-public (ps-embed-cff body font-set-name version) @@ -214,7 +203,6 @@ (string-append (format "/~a ~s StartData " font-set-name (string-length body)) body)) - (header (format "%%BeginResource: font ~a @@ -233,12 +221,9 @@ (footer "\n%%EndData %%EndResource %%EndResource\n")) - - (string-append - header - binary-data - footer))) - + (string-append header + binary-data + footer))) (define (write-preamble paper load-fonts? port) (define (internal-font? file-name) @@ -246,14 +231,17 @@ (string-startswith file-name "emmentaler") (string-startswith file-name "aybabtu") (string-startswith file-name "Aybabtu"))) - (define (load-font-via-GS font-name-filename) + + (define (load-font-via-GS font-name-filename) (define (ps-load-file file-name) (if (string? file-name) (if (string-contains file-name (ly:get-option 'datadir)) (begin - (set! file-name (ly:string-substitute (ly:get-option 'datadir) "" file-name)) - (format "lilypond-datadir (~a) concatstrings (r) file .loadfont" file-name)) - + (set! file-name (ly:string-substitute (ly:get-option 'datadir) + "" file-name)) + (format + "lilypond-datadir (~a) concatstrings (r) file .loadfont\n" + file-name)) (format "(~a) (r) file .loadfont\n" file-name)) (format "% cannot find font file: ~a\n" file-name))) @@ -261,79 +249,63 @@ (name (cadr font-name-filename)) (file-name (caddr font-name-filename)) (bare-file-name (ly:find-file file-name))) - - (cons - name - - (if (mac-font? bare-file-name) - (handle-mac-font name bare-file-name) - (cond - ((internal-font? file-name) - (ps-load-file (ly:find-file - (format "~a.otf" file-name)))) - ((string? bare-file-name) - (ps-load-file file-name)) - (else - (ly:warning (_ "cannot embed ~S=~S") name file-name) - ""))) - - ))) + (cons name + (if (mac-font? bare-file-name) + (handle-mac-font name bare-file-name) + (cond + ((internal-font? file-name) + (ps-load-file (ly:find-file + (format "~a.otf" file-name)))) + ((string? bare-file-name) + (ps-load-file file-name)) + (else + (ly:warning (_ "cannot embed ~S=~S") name file-name) + "")))))) (define (dir-join a b) (if (equal? a "") b (string-append a "/" b))) - + (define (dir-listing dir-name) (define (dir-helper dir lst) (let ((e (readdir dir))) - (if (eof-object? e) lst (dir-helper dir (cons e lst))))) + (if (eof-object? e) + lst + (dir-helper dir (cons e lst))))) (reverse (dir-helper (opendir dir-name) '()))) - - (define (handle-mac-font name filename) - (let* - ((dir-name (tmpnam)) - (files '()) - (status 0) - (embed #f)) + (define (handle-mac-font name filename) + (let* ((dir-name (tmpnam)) + (files '()) + (status 0) + (embed #f)) (mkdir dir-name #o700) (set! status (ly:system (format "cd ~a && fondu -force '~a'" dir-name filename))) - (set! files (dir-listing dir-name)) - (for-each (lambda (f) - (let* - ((full-name (dir-join dir-name f))) - + (let* ((full-name (dir-join dir-name f))) (if (and (not embed) (equal? 'regular (stat:type (stat full-name))) (equal? name (ly:ttf-ps-name full-name))) - - (set! embed - (font-file-as-ps-string name full-name))) - - (if (or (equal? "." f) + (set! embed (font-file-as-ps-string name full-name))) + (if (or (equal? "." f) (equal? ".." f)) #t (delete-file full-name)))) - - files) (rmdir dir-name) - (if (not embed) (begin (set! embed "% failed\n") - (ly:warning (_ "cannot extract file matching ~a from ~a") name filename))) + (ly:warning (_ "cannot extract file matching ~a from ~a") + name filename))) embed)) - (define (font-file-as-ps-string name file-name) - (let* - ((downcase-file-name (string-downcase file-name))) - + (define (font-file-as-ps-string name file-name font-index) + (let* ((downcase-file-name (string-downcase file-name))) (cond ((and file-name (string-endswith downcase-file-name ".pfa")) (embed-document file-name)) @@ -341,44 +313,39 @@ (ly:pfb->pfa file-name)) ((and file-name (string-endswith downcase-file-name ".ttf")) (ly:ttf->pfa file-name)) + ((and file-name (string-endswith downcase-file-name ".ttc")) + (ly:ttf->pfa file-name font-index)) ((and file-name (string-endswith downcase-file-name ".otf")) (ps-embed-cff (ly:otf->cff file-name) name 0)) (else (ly:warning (_ "do not know how to embed ~S=~S") name file-name) "")))) - (define (mac-font? bare-file-name) - (and - (eq? PLATFORM 'darwin) - bare-file-name - (or - (string-endswith bare-file-name ".dfont") - (= (stat:size (stat bare-file-name)) 0)))) - - (define (load-font font-name-filename) - (let* ((font (car font-name-filename)) - (name (cadr font-name-filename)) - (file-name (caddr font-name-filename)) + (define (mac-font? bare-file-name) + (and (eq? PLATFORM 'darwin) + bare-file-name + (or (string-endswith bare-file-name ".dfont") + (= (stat:size (stat bare-file-name)) 0)))) + + (define (load-font font-psname-filename-fontindex) + (let* ((font (list-ref font-psname-filename-fontindex 0)) + (name (list-ref font-psname-filename-fontindex 1)) + (file-name (list-ref font-psname-filename-fontindex 2)) + (font-index (list-ref font-psname-filename-fontindex 3)) (bare-file-name (ly:find-file file-name))) - - (cons - name - (cond - - ((mac-font? bare-file-name) - (handle-mac-font name bare-file-name)) - - ((and font (cff-font? font)) - (ps-embed-cff (ly:otf-font-table-data font "CFF ") - name - 0)) - - (bare-file-name (font-file-as-ps-string name bare-file-name)) - (else - (ly:warning (_ "do not know how to embed font ~s ~s ~s") - name file-name font)))))) + (cons name + (cond ((mac-font? bare-file-name) + (handle-mac-font name bare-file-name)) + ((and font (cff-font? font)) + (ps-embed-cff (ly:otf-font-table-data font "CFF ") + name + 0)) + (bare-file-name (font-file-as-ps-string + name bare-file-name font-index)) + (else + (ly:warning (_ "do not know how to embed font ~s ~s ~s") + name file-name font)))))) - (define (load-fonts paper) (let* ((fonts (ly:paper-fonts paper)) @@ -386,69 +353,59 @@ (all-font-names (map (lambda (font) - (cond - ((string? (ly:font-file-name font)) - (list (list - font - (ly:font-name font) - (ly:font-file-name font)))) - ((ly:pango-font? font) - (map - (lambda (name-psname-pair) - (list #f - (car name-psname-pair) - (cdr name-psname-pair))) - (ly:pango-font-physical-fonts font))) - - (else - (ly:font-sub-fonts font)))) - + (cond ((string? (ly:font-file-name font)) + (list (list font + (ly:font-name font) + (ly:font-file-name font) + #f))) + ((ly:pango-font? font) + (map (lambda (psname-filename-fontindex) + (list #f + (list-ref psname-filename-fontindex 0) + (list-ref psname-filename-fontindex 1) + (list-ref psname-filename-fontindex 2))) + (ly:pango-font-physical-fonts font))) + (else + (ly:font-sub-fonts font)))) fonts)) - (font-names - (uniq-list - (sort (apply append all-font-names) - (lambda (x y) (stringpdf 0 0 (format "~a.eps" filename))) + (postscript->pdf 0 0 (format "~a.eps" filename))) )) extents-system-pairs) @@ -618,13 +575,13 @@ (define-public (clip-system-EPSes basename paper-book) - (define do-pdf (member "pdf" (ly:output-formats))) + (define do-pdf (member "pdf" (ly:output-formats))) (define (clip-score-systems basename systems) (let* ((layout (ly:grob-layout (paper-system-system-grob (car systems)))) (regions (ly:output-def-lookup layout 'clip-regions))) - + (for-each (lambda (region) (clip-systems-to-region @@ -634,9 +591,9 @@ (rhythmic-location->file-string (cdr region))) layout systems region do-pdf)) - + regions))) - + ;; partition in system lists sharing their layout blocks (let* @@ -644,22 +601,22 @@ (count 0) (score-system-list '())) - (fold + (fold (lambda (system last-system) - - + + (if (not (and last-system (equal? (paper-system-layout last-system) (paper-system-layout system)))) (set! score-system-list (cons '() score-system-list))) - + (if (paper-system-layout system) (set-car! score-system-list (cons system (car score-system-list)))) ;; pass value. system) - #f + #f systems) (for-each @@ -736,7 +693,7 @@ (landscape (ly:output-def-lookup defs 'landscape)) (output-scale (ly:output-def-lookup defs 'output-scale)) (convert (lambda (x) (* x output-scale (/ (ly:bp 1))))) - + (paper-width (convert (ly:output-def-lookup defs 'paper-width))) (paper-height (convert (ly:output-def-lookup defs 'paper-height))) @@ -768,8 +725,8 @@ (define-public (output-classic-framework basename book scopes fields) - (ly:error (_ "\nThe PostScript backend does not support the system-by-system -output. For that, use the EPS backend instead, + (ly:error (_ "\nThe PostScript backend does not support the system-by-system +output. For that, use the EPS backend instead, lilypond -dbackend=eps FILE diff --git a/scm/lily.scm b/scm/lily.scm index bddb9982a7..900c347c26 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -87,8 +87,6 @@ on errors, and print a stack trace.") (separate-log-files #f "Output to FILE.log per file.") (trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.") (trace-scheme-coverage #f "Record coverage of Scheme files") - (ttf-verbosity 0 - "how much verbosity for TTF font embedding?") (show-available-fonts #f "List font names available.") (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") diff --git a/tex/texinfo.tex b/tex/texinfo.tex index 434a90f5ae..c7c92b8de7 100644 --- a/tex/texinfo.tex +++ b/tex/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-11-07.12} +\def\texinfoversion{2008-12-16.21} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -98,6 +98,8 @@ \let\ptexstar=\* \let\ptext=\t \let\ptextop=\top +{\catcode`\'=\active +\global\let\ptexquoteright'}% Math-mode def from plain.tex. % If this character appears in an error message or help string, it % starts a new line in the output. @@ -945,6 +947,8 @@ where each line of input produces a line of output.} \catcode`>=\other \catcode`+=\other \catcode`-=\other + \catcode`\`=\other + \catcode`\'=\other } \def\pushthisfilestack{% @@ -1143,11 +1147,13 @@ where each line of input produces a line of output.} \catcode`< = \active \catcode`> = \active \catcode`+ = \active + \catcode`' = \active \gdef\mathactive{% \let^ = \ptexhat \let< = \ptexless \let> = \ptexgtr \let+ = \ptexplus + \let' = \ptexquoteright } } @@ -1329,7 +1335,10 @@ output) for that.)} \def\cmykDarkRed{0.28 1 1 0.35} \def\cmykBlack{0 0 0 1} % - \def\pdfsetcolor#1{\pdfliteral{#1 k}} + % k sets the color for filling (usual text, etc.); + % K sets the color for stroking (thin rules, e.g., normal _'s). + \def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}} + % % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. \def\setcolor#1{% @@ -1598,6 +1607,7 @@ output) for that.)} \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else + % non-pdf mode \let\pdfmkdest = \gobble \let\pdfurl = \gobble \let\endlink = \relax @@ -1628,6 +1638,10 @@ output) for that.)} \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} \def\tt{\fam=\ttfam \setfontstyle{tt}} +% Unfortunately, we have to override this for titles and the like, since +% in those cases "rm" is bold. Sigh. +\def\rmisbold{\rm\def\curfontstyle{bf}} + % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. \newfam\sffam @@ -2025,8 +2039,6 @@ end \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} \def\titleecsize{2074} % Chapter (and unnumbered) fonts (17.28pt). @@ -2158,8 +2170,6 @@ end \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} \def\titleecsize{2074} % Chapter fonts (14.4pt). @@ -2291,7 +2301,7 @@ end \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% \resetmathfonts \setleading{25pt}} -\def\titlefont#1{{\titlefonts\rm #1}} +\def\titlefont#1{{\titlefonts\rmisbold #1}} \def\chapfonts{% \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc @@ -2342,6 +2352,16 @@ end \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{9.5pt}} +% Fonts for short table of contents. +\setfont\shortcontrm\rmshape{12}{1000}{OT1} +\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 +\setfont\shortcontsl\slshape{12}{1000}{OT1} +\setfont\shortconttt\ttshape{12}{1000}{OT1TT} + +% Define these just so they can be easily changed for other fonts. +\def\angleleft{$\langle$} +\def\angleright{$\rangle$} + % Set the fonts to use with the @small... environments. \let\smallexamplefonts = \smallfonts @@ -2355,28 +2375,128 @@ end % % By the way, for comparison, here's what fits with @example (10pt): % 8.5x11=71 smallbook=60 a4=75 a5=58 -% -% I wish the USA used A4 paper. % --karl, 24jan03. - % Set up the default fonts, so we can use them for creating boxes. % \definetextfontsizexi -% Define these so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} + +\message{markup,} + +% Check if we are currently using a typewriter font. Since all the +% Computer Modern typewriter fonts have zero interword stretch (and +% shrink), and it is reasonable to expect all typewriter fonts to have +% this property, we can check that font parameter. +% +\def\ifmonospace{\ifdim\fontdimen3\font=0pt } + +% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will +% define and register \INITMACRO to be called on markup style changes. +% \INITMACRO can check \currentmarkupstyle for the innermost +% style and the set of \ifmarkupSTYLE switches for all styles +% currently in effect. +\newif\ifmarkupvar +\newif\ifmarkupsamp +\newif\ifmarkupkey +%\newif\ifmarkupfile % @file == @samp. +%\newif\ifmarkupoption % @option == @samp. +\newif\ifmarkupcode +\newif\ifmarkupkbd +%\newif\ifmarkupenv % @env == @code. +%\newif\ifmarkupcommand % @command == @code. +\newif\ifmarkuptex % @tex (and part of @math, for now). +\newif\ifmarkupexample +\newif\ifmarkupverb +\newif\ifmarkupverbatim + +\let\currentmarkupstyle\empty + +\def\setupmarkupstyle#1{% + \csname markup#1true\endcsname + \def\currentmarkupstyle{#1}% + \markupstylesetup +} + +\let\markupstylesetup\empty + +\def\defmarkupstylesetup#1{% + \expandafter\def\expandafter\markupstylesetup + \expandafter{\markupstylesetup #1}% + \def#1% +} + +% Markup style setup for left and right quotes. +\defmarkupstylesetup\markupsetuplq{% + \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuplqdefault \else \temp \fi +} + +\defmarkupstylesetup\markupsetuprq{% + \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuprqdefault \else \temp \fi +} + +{ +\catcode`\'=\active +\catcode`\`=\active + +\gdef\markupsetuplqdefault{\let`\lq} +\gdef\markupsetuprqdefault{\let'\rq} + +\gdef\markupsetcodequoteleft{\let`\codequoteleft} +\gdef\markupsetcodequoteright{\let'\codequoteright} + +\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} +} + +\let\markupsetuplqcode \markupsetcodequoteleft +\let\markupsetuprqcode \markupsetcodequoteright +\let\markupsetuplqexample \markupsetcodequoteleft +\let\markupsetuprqexample \markupsetcodequoteright +\let\markupsetuplqverb \markupsetcodequoteleft +\let\markupsetuprqverb \markupsetcodequoteright +\let\markupsetuplqverbatim \markupsetcodequoteleft +\let\markupsetuprqverbatim \markupsetcodequoteright + +\let\markupsetuplqsamp \markupsetnoligaturesquoteleft +\let\markupsetuplqkbd \markupsetnoligaturesquoteleft + +% Allow an option to not replace quotes with a regular directed right +% quote/apostrophe (char 0x27), but instead use the undirected quote +% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it +% the default, but it works for pasting with more pdf viewers (at least +% evince), the lilypond developers report. xpdf does work with the +% regular 0x27. +% +\def\codequoteright{% + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi + \else \char'15 \fi +} +% +% and a similar option for the left quote char vs. a grave accent. +% Modern fonts display ASCII 0x60 as a grave accent, so some people like +% the code environments to do likewise. +% +\def\codequoteleft{% + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + % [Knuth] pp. 380,381,391 + % \relax disables Spanish ligatures ?` and !` of \tt font. + \relax`% + \else \char'22 \fi + \else \char'22 \fi +} + +% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. +\def\noligaturesquoteleft{\relax\lq} % Count depth in font-changes, for error checks \newcount\fontdepth \fontdepth=0 -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic @@ -2391,17 +2511,22 @@ end % @var is set to this for defun arguments. \def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} -% like \smartslanted except unconditionally use \sl. We never want +% @cite is like \smartslanted except unconditionally use \sl. We never want % ttsl for book titles, do we? \def\cite#1{{\sl #1}\futurelet\next\smartitalicx} \let\i=\smartitalic \let\slanted=\smartslanted -\let\var=\smartslanted +\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}} \let\dfn=\smartslanted \let\emph=\smartitalic -% @b, explicit bold. +% Explicit font changes: @r, @sc, undocumented @ii. +\def\r#1{{\rm #1}} % roman font +\def\sc#1{{\smallcaps#1}} % smallcaps font +\def\ii#1{{\it #1}} % italic font + +% @b, explicit bold. Also @strong. \def\b#1{{\bf #1}} \let\strong=\b @@ -2433,22 +2558,35 @@ end \catcode`@=\other \def\endofsentencespacefactor{3000}% default +% @t, explicit typewriter. \def\t#1{% {\tt \rawbackslash \plainfrenchspacing #1}% \null } -\def\samp#1{`\tclose{#1}'\null} -\setfont\keyrm\rmshape{8}{1000}{OT1} -\font\keysy=cmsy9 -\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% - \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% - \vbox{\hrule\kern-0.4pt - \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% - \kern-0.4pt\hrule}% - \kern-.06em\raise0.4pt\hbox{\angleright}}}} -\def\key #1{{\nohyphenation \uppercase{#1}}\null} -% The old definition, with no lozenge: -%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} + +% @samp. +\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} + +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setupmarkupstyle{key} + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} + +% ctrl is no longer a Texinfo command. \def\ctrl #1{{\tt \rawbackslash \hat}#1} % @file, @option are the same as @samp. @@ -2493,9 +2631,8 @@ end \global\let'=\rq \global\let`=\lq % default definitions % \global\def\code{\begingroup - \catcode\rquoteChar=\active \catcode\lquoteChar=\active - \let'\codequoteright \let`\codequoteleft - % + \setupmarkupstyle{code}% + % The following should really be moved into \setupmarkupstyle handlers. \catcode\dashChar=\active \catcode\underChar=\active \ifallowcodebreaks \let-\codedash @@ -2547,6 +2684,7 @@ end % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. +\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), % `example' (@kbd uses ttsl only inside of @example and friends), @@ -2568,14 +2706,14 @@ end \def\wordexample{example} \def\wordcode{code} -% Default is `distinct.' +% Default is `distinct'. \kbdinputstyle distinct \def\xkey{\key} \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% \ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\look}}\fi -\else{\tclose{\kbdfont\look}}\fi} +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} % For @indicateurl, @env, @command quotes seem unnecessary, so use \code. \let\indicateurl=\code @@ -2638,30 +2776,16 @@ end \let\email=\uref \fi -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - % Typeset a dimension, e.g., `in' or `pt'. The only reason for the % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % \def\dmn#1{\thinspace #1} -\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} - % @l was never documented to mean ``switch to the Lisp font'', % and it is not used as such in any manual I can find. We need it for % Polish suppressed-l. --karl, 22sep96. %\def\l#1{{\li #1}\null} -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - % @acronym for "FBI", "NATO", and the like. % We print this one point size smaller, since it's intended for % all-uppercase. @@ -2687,6 +2811,44 @@ end \fi } + +\message{glyphs,} + +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. +% +% Since these characters are used in examples, they should be an even number of +% \tt widths. Each \tt character is 1en, so two makes it 1em. +% +\def\point{$\star$} +\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} +\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} +\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} +\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} +\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} + +% The @error{} command. +% Adapted from the TeXbook's \boxit. +% +\newbox\errorbox +% +{\tentt \global\dimen0 = 3em}% Width of the box. +\dimen2 = .55pt % Thickness of rules +% The text. (`r' is open on the right, `e' somewhat less so on the left.) +\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} +% +\setbox\errorbox=\hbox to \dimen0{\hfil + \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. + \advance\hsize by -2\dimen2 % Rules. + \vbox{% + \hrule height\dimen2 + \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. + \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. + \kern3pt\vrule width\dimen2}% Space to right. + \hrule height\dimen2} + \hfil} +% +\def\error{\leavevmode\lower.7ex\copy\errorbox} + % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % \def\pounds{{\it\$}} @@ -2752,16 +2914,31 @@ end \def\quotesinglbase{{\ecfont \char"0D}} % % This positioning is not perfect (see the ogonek LaTeX package), but -% we have the precomposed glyphs for the most common cases. +% we have the precomposed glyphs for the most common cases. We put the +% tests to use those glyphs in the single \ogonek macro so we have fewer +% dummy definitions to worry about for index entries, etc. +% % ogonek is also used with other letters in Lithuanian (IOU), but using % the precomposed glyphs for those is not so easy since they aren't in % the same EC font. -\def\ogonek#1{{\ecfont \setbox0=\hbox{#1}\ifdim\ht0=1ex\accent"0C #1% - \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}\fi}} -\def\Aogonek{{\ecfont \char"81}} -\def\Eogonek{{\ecfont \char"86}} -\def\aogonek{{\ecfont \char"A1}} -\def\eogonek{{\ecfont \char"A6}} +\def\ogonek#1{{% + \def\temp{#1}% + \ifx\temp\macrocharA\Aogonek + \else\ifx\temp\macrochara\aogonek + \else\ifx\temp\macrocharE\Eogonek + \else\ifx\temp\macrochare\eogonek + \else + \ecfont \setbox0=\hbox{#1}% + \ifdim\ht0=1ex\accent"0C #1% + \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% + \fi + \fi\fi\fi\fi + }% +} +\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} +\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} +\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} +\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} % \def\ecfont{% % We can't distinguish serif/sans and italic/slanted, but this @@ -2892,12 +3069,9 @@ end \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} -\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines - \let\tt=\authortt} - \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rm #1} + \leftline{\titlefonts\rmisbold #1} % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt @@ -2918,7 +3092,7 @@ end \else \checkenv\titlepage \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\authorfont \leftline{#1}}% + {\secfonts\rmisbold \leftline{#1}}% \fi } @@ -4050,6 +4224,7 @@ end \definedummyword\guilsinglright \definedummyword\expansion \definedummyword\minus + \definedummyword\ogonek \definedummyword\pounds \definedummyword\point \definedummyword\print @@ -4093,6 +4268,7 @@ end \definedummyword\v \definedummyword\H \definedummyword\dotaccent + \definedummyword\ogonek \definedummyword\ringaccent \definedummyword\tieaccent \definedummyword\ubaraccent @@ -5075,7 +5251,6 @@ end % 3) Likewise, headings look best if no \parindent is used, and % if justification is not attempted. Hence \raggedright. - \def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% \parsearg\chapheadingzzz @@ -5085,7 +5260,7 @@ end \def\chapheadingzzz#1{% {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright - \rm #1\hfill}}% + \rmisbold #1\hfill}}% \bigskip \par\penalty 200\relax \suppressfirstparagraphindent } @@ -5204,7 +5379,7 @@ end \domark % {% - \chapfonts \rm + \chapfonts \rmisbold % % Have to define \lastsection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called @@ -5266,7 +5441,7 @@ end \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\nobreak + \rmisbold #1\hfill}}\bigskip \par\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% @@ -5275,7 +5450,7 @@ end \def\centerchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt - \hfill {\rm #1}\hfill}}\bigskip \par\nobreak + \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak } \def\CHAPFopen{% \global\let\chapmacro=\chfopen @@ -5308,7 +5483,7 @@ end \def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. - \csname #2fonts\endcsname \rm + \csname #2fonts\endcsname \rmisbold % \def\sectionlevel{#2}% \def\temptype{#3}% @@ -5344,6 +5519,11 @@ end \fi \fi\fi\fi % + % Go into vertical mode. Usually we'll already be there, but we + % don't want the following whatsit to end up in a preceding paragraph + % if the document didn't happen to have a blank line. + \par + % % Output the mark. Pass it through \safewhatsit, to take care of % the preceding space. \safewhatsit\domark @@ -5691,46 +5871,12 @@ end \message{environments,} % @foo ... @end foo. -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, they should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - % @tex ... @end tex escapes into raw Tex temporarily. % One exception: @ is still an escape character, so that @end tex works. % But \@ or @@ will get a plain tex @ character. \envdef\tex{% + \setupmarkupstyle{tex}% \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie @@ -5740,6 +5886,8 @@ end \catcode `\|=\other \catcode `\<=\other \catcode `\>=\other + \catcode`\`=\other + \catcode`\'=\other \escapechar=`\\ % \let\b=\ptexb @@ -5875,6 +6023,7 @@ end % This macro is called at the beginning of all the @example variants, % inside a group. +\newdimen\nonfillparindent \def\nonfillstart{% \aboveenvbreak \hfuzz = 12pt % Don't be fussy @@ -5882,7 +6031,12 @@ end \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output \parskip = 0pt + % Turn off paragraph indentation but redefine \indent to emulate + % the normal \indent. + \nonfillparindent=\parindent \parindent = 0pt + \let\indent\nonfillindent + % \emergencystretch = 0pt % don't try to avoid overfull boxes \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing @@ -5893,6 +6047,24 @@ end \let\exdent=\nofillexdent } +\begingroup +\obeyspaces +% We want to swallow spaces (but not other tokens) after the fake +% @indent in our nonfill-environments, where spaces are normally +% active and set to @tie, resulting in them not being ignored after +% @indent. +\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% +\gdef\nonfillindentcheck{% +\ifx\temp % +\expandafter\nonfillindentgobble% +\else% +\leavevmode\nonfillindentbox% +\fi% +}% +\endgroup +\def\nonfillindentgobble#1{\nonfillindent} +\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} + % If you want all examples etc. small: @set dispenvsize small. % If you want even small examples the full size: @set dispenvsize nosmall. % This affects the following displayed environments: @@ -5941,7 +6113,7 @@ end % \maketwodispenvs {lisp}{example}{% \nonfillstart - \tt\quoteexpand + \tt\setupmarkupstyle{example}% \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } @@ -6045,6 +6217,10 @@ end \do\ \do\\\do\{\do\}\do\$\do\&% \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% \do\<\do\>\do\|\do\@\do+\do\"% + % Don't do the quotes -- if we do, @set txicodequoteundirected and + % @set txicodequotebacktick will not have effect on @verb and + % @verbatim, and ?` and !` ligatures won't get disabled. + %\do\`\do\'% } % % [Knuth] p. 380 @@ -6062,7 +6238,7 @@ end \def\setupverb{% \tt % easiest (and conventionally used) font for verbatim \def\par{\leavevmode\endgraf}% - \catcode`\`=\active + \setupmarkupstyle{verb}% \tabeightspaces % Respect line breaks, % print special symbols as themselves, and @@ -6077,33 +6253,6 @@ end \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % \def\starttabbox{\setbox0=\hbox\bgroup} - -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\def\codequoteleft{% - \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - \relax`% the \relax disables the `! and `? ligatures - \else \char'22 \fi - \else \char'22 \fi -} % \begingroup \catcode`\^^I=\active @@ -6117,13 +6266,6 @@ end \wd0=\dimen0 \box0 \starttabbox }% } - \catcode`\'=\active - \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}% - % - \catcode`\`=\active - \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}% - % - \gdef\quoteexpand{\rquoteexpand \lquoteexpand}% \endgroup % start the verbatim environment. @@ -6133,9 +6275,8 @@ end % Easiest (and conventionally used) font for verbatim \tt \def\par{\leavevmode\egroup\box0\endgraf}% - \catcode`\`=\active \tabexpand - \quoteexpand + \setupmarkupstyle{verbatim}% % Respect line breaks, % print special symbols as themselves, and % make each space count @@ -6474,7 +6615,7 @@ end % % On the other hand, if an argument has two dashes (for instance), we % want a way to get ttsl. Let's try @var for that. - \let\var=\ttslanted + \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% #1% \sl\hyphenchar\font=45 } @@ -7923,7 +8064,7 @@ directory should work if nowhere else does.} \gdef^^a8{\"{}} \gdef^^a9{\copyright} \gdef^^aa{\ordf} - \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^ab{\guillemetleft} \gdef^^ac{$\lnot$} \gdef^^ad{\-} \gdef^^ae{\registeredsymbol} @@ -7942,7 +8083,7 @@ directory should work if nowhere else does.} \gdef^^b9{$^1$} \gdef^^ba{\ordm} % - \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^bb{\guilletright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} \gdef^^be{$3\over4$} @@ -8035,7 +8176,7 @@ directory should work if nowhere else does.} % Latin2 (ISO-8859-2) character definitions. \def\lattwochardefs{% \gdef^^a0{~} - \gdef^^a1{\Aogonek} + \gdef^^a1{\ogonek{A}} \gdef^^a2{\u{}} \gdef^^a3{\L} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} @@ -8052,7 +8193,7 @@ directory should work if nowhere else does.} \gdef^^af{\dotaccent Z} % \gdef^^b0{\textdegree} - \gdef^^b1{\aogonek} + \gdef^^b1{\ogonek{a}} \gdef^^b2{\ogonek{ }} \gdef^^b3{\l} \gdef^^b4{\'{}} @@ -8078,7 +8219,7 @@ directory should work if nowhere else does.} \gdef^^c7{\cedilla C} \gdef^^c8{\v C} \gdef^^c9{\'E} - \gdef^^ca{\Eogonek} + \gdef^^ca{\ogonek{E}} \gdef^^cb{\"E} \gdef^^cc{\v E} \gdef^^cd{\'I} @@ -8112,7 +8253,7 @@ directory should work if nowhere else does.} \gdef^^e7{\cedilla c} \gdef^^e8{\v c} \gdef^^e9{\'e} - \gdef^^ea{\eogonek} + \gdef^^ea{\ogonek{e}} \gdef^^eb{\"e} \gdef^^ec{\v e} \gdef^^ed{\'\i} @@ -8341,14 +8482,14 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0101}{\=a} \DeclareUnicodeCharacter{0102}{\u{A}} \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0104}{\Aogonek} - \DeclareUnicodeCharacter{0105}{\aogonek} + \DeclareUnicodeCharacter{0104}{\ogonek{A}} + \DeclareUnicodeCharacter{0105}{\ogonek{a}} \DeclareUnicodeCharacter{0106}{\'C} \DeclareUnicodeCharacter{0107}{\'c} \DeclareUnicodeCharacter{0108}{\^C} \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{0118}{\Eogonek} - \DeclareUnicodeCharacter{0119}{\eogonek} + \DeclareUnicodeCharacter{0118}{\ogonek{E}} + \DeclareUnicodeCharacter{0119}{\ogonek{e}} \DeclareUnicodeCharacter{010A}{\dotaccent{C}} \DeclareUnicodeCharacter{010B}{\dotaccent{c}} \DeclareUnicodeCharacter{010C}{\v{C}} @@ -8879,6 +9020,9 @@ directory should work if nowhere else does.} \message{and turning on texinfo input format.} +% DEL is a comment character, in case @c does not suffice. +\catcode`\^^? = 14 + % Define macros to output various characters with catcode for normal text. \catcode`\"=\other \catcode`\~=\other @@ -9000,6 +9144,8 @@ directory should work if nowhere else does.} @let>=@normalgreater @let+=@normalplus @let$=@normaldollar %$ font-lock fix + @markupsetuplqdefault + @markupsetuprqdefault @unsepspaces } @@ -9038,9 +9184,10 @@ directory should work if nowhere else does.} @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we @c don't make ` and ' active, @code will not get them as active chars. @c Do this last of all since we use ` in the previous @catcode assignments. -@c (not ready yet, sigh) -@c atcode`@'=@active @let'@rq -@c atcode`@`=@active @let`@lq +@catcode`@'=@active +@catcode`@`=@active +@markupsetuplqdefault +@markupsetuprqdefault @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp)