diff options
| author | David Kastrup <dak@gnu.org> | 2015-05-27 04:25:32 +0200 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2015-06-02 10:41:29 +0200 |
| commit | 98ac53591234404cd70c5eebd370a598ec74095b (patch) | |
| tree | d5ba3574fb95bb4fbf3c711c9af94a449159a9ba | |
| parent | 0200dabbc6e9bfa91c38f1199a2cdf9bfb43d026 (diff) | |
Issue 4422/5: Run scripts/auxiliar/update-with-convert-ly.sh
119 files changed, 574 insertions, 575 deletions
diff --git a/Documentation/ca/learning/fundamental.itely b/Documentation/ca/learning/fundamental.itely index 21f4bcf00b..34f7145968 100644 --- a/Documentation/ca/learning/fundamental.itely +++ b/Documentation/ca/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Conceptes fonamentals @chapter Conceptes fonamentals @@ -3188,7 +3188,7 @@ El LilyPond també pot gestionar substitucions no estàtiques @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/ca/learning/tweaks.itely b/Documentation/ca/learning/tweaks.itely index c24d32262c..45a6626fa8 100644 --- a/Documentation/ca/learning/tweaks.itely +++ b/Documentation/ca/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Ajustament de la sortida @chapter Ajustament de la sortida @@ -4325,7 +4325,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4356,7 +4356,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4392,7 +4392,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4426,7 +4426,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4456,7 +4456,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4504,7 +4504,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4535,7 +4535,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/cs/learning/fundamental.itely b/Documentation/cs/learning/fundamental.itely index 4b99b1f9e2..15084751a5 100644 --- a/Documentation/cs/learning/fundamental.itely +++ b/Documentation/cs/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Pavel Fric @node Základní pojmy @@ -3289,7 +3289,7 @@ kann sie sich als Funktionen vorstellen. @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = $padding diff --git a/Documentation/cs/learning/tweaks.itely b/Documentation/cs/learning/tweaks.itely index c08faed18b..e5c9885f13 100644 --- a/Documentation/cs/learning/tweaks.itely +++ b/Documentation/cs/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Ladění výstupu @chapter Ladění výstupu @@ -4024,7 +4024,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4060,7 +4060,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4098,7 +4098,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4134,7 +4134,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4167,7 +4167,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4217,7 +4217,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4251,7 +4251,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/de/extending/programming-interface.itely b/Documentation/de/extending/programming-interface.itely index b8258b60a5..0694e92680 100644 --- a/Documentation/de/extending/programming-interface.itely +++ b/Documentation/de/extending/programming-interface.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala @@ -95,7 +95,7 @@ Die übliche Form zur Definition von Scheme-Funktionen ist: @example function = #(define-scheme-function - (parser location @var{Arg1} @var{Arg2} @dots{}) + (@var{Arg1} @var{Arg2} @dots{}) (@var{Typ1?} @var{Typ2?} @dots{}) @var{body}) @end example @@ -261,7 +261,7 @@ Prädikat @code{void?} erfüllt) wiedergegeben wird. @example noPointAndClick = #(define-void-function - (parser location) + () () (ly:set-option 'point-and-click #f)) ... @@ -311,7 +311,7 @@ Die allgemeine Form zur Definition musikalischer Funktionen ist: @example function = #(define-music-function - (parser location @var{Arg1} @var{Arg2} @dots{}) + (@var{Arg1} @var{Arg2} @dots{}) (@var{Typ1?} @var{Typ2?} @dots{}) @var{body}) @end example @@ -403,7 +403,7 @@ mit der Variable @code{pair?} weitergeleitet werden: @example manualBeam = #(define-music-function - (parser location beg-end) + (beg-end) (pair?) #@{ \once \override Beam.positions = #beg-end @@ -422,7 +422,7 @@ augenommen werden: @lilypond[quote,verbatim,ragged-right] manualBeam = #(define-music-function - (parser location beg end) + (beg end) (number? number?) #{ \once \override Beam.positions = #(cons beg end) @@ -444,7 +444,7 @@ auch Scheme-Programmcode enthalten: @lilypond[quote,verbatim,ragged-right] AltOn = #(define-music-function - (parser location mag) + (mag) (number?) #{ \override Stem.length = #(* 7.0 mag) @@ -470,7 +470,7 @@ zu integrieren: @lilypond[quote,verbatim,ragged-right] withAlt = #(define-music-function - (parser location mag music) + (mag music) (number? ly:music?) #{ \override Stem.length = #(* 7.0 mag) @@ -505,7 +505,7 @@ musikalische Funktion ohne Argumente zu erstellen: @example displayBarNum = #(define-music-function - (parser location) + () () (if (eq? #t (ly:get-option 'display-bar-numbers)) #@{ \once \override Score.BarNumber.break-visibility = ##f #@} @@ -552,7 +552,7 @@ angehängt, wie @code{c'\pp}. Das Folgende ist eine Möglichkeit, beliebige Dynamikbefehle zu schreiben: @lilypond[quote,verbatim,ragged-right] -dyn=#(define-event-function (parser location arg) (markup?) +dyn=#(define-event-function (arg) (markup?) (make-dynamic-script arg)) \relative { c'\dyn pfsss } @end lilypond diff --git a/Documentation/de/extending/scheme-tutorial.itely b/Documentation/de/extending/scheme-tutorial.itely index 90f8daebfe..7eddf993b2 100644 --- a/Documentation/de/extending/scheme-tutorial.itely +++ b/Documentation/de/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Scheme-Übung @chapter Scheme-Übung @@ -1343,7 +1343,7 @@ keine speziellen Überprüfungen nötig sind, bevor ein anderes Element vor die @code{articulations}-Eigenschaft gesetzt wird. @example -doubleSlur = #(define-music-function (parser location note) (ly:music?) +doubleSlur = #(define-music-function (note) (ly:music?) "Return: @{ note ( note ) @}. `note' is supposed to be a single note." (let ((note2 (ly:music-deep-copy note))) @@ -1543,7 +1543,7 @@ Funktion umgewandelt (hierzu gehört etwas syntaktischer Zuckerguß und eine Deklaration des Typs ihres einzigen @qq{wirklichen} Arguments: @example -addAccent = #(define-music-function (parser location note-event) +addAccent = #(define-music-function (note-event) (ly:music?) "Add an accent ArticulationEvent to the articulations of `note-event', which is supposed to be a NoteEvent expression." @@ -1588,7 +1588,7 @@ TODO Find a simple example @lilypond[quote,verbatim,ragged-right] -padText = #(define-music-function (parser location padding) (number?) +padText = #(define-music-function (padding) (number?) #{ \once \override TextScript.padding = #padding #}) @@ -1609,7 +1609,7 @@ Es kann auch benutzt werden, um Befehle zu erstellen: @c It is - 'padding still works @lilypond[quote,verbatim,ragged-right] -tempoPadded = #(define-music-function (parser location padding tempotext) +tempoPadded = #(define-music-function (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding @@ -1627,7 +1627,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext) Sogar ganze Musikausdrücke können eingefügt werden: @lilypond[quote,verbatim,ragged-right] -pattern = #(define-music-function (parser location x y) (ly:music? ly:music?) +pattern = #(define-music-function (x y) (ly:music? ly:music?) #{ #x e8 a b $y b a e #}) diff --git a/Documentation/de/learning/fundamental.itely b/Documentation/de/learning/fundamental.itely index 3e218ffe67..459cf40c3e 100644 --- a/Documentation/de/learning/fundamental.itely +++ b/Documentation/de/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala, Reinhold Kainhofer @node Grundbegriffe @@ -3324,7 +3324,7 @@ kann sie sich als Funktionen vorstellen. @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/de/learning/tweaks.itely b/Documentation/de/learning/tweaks.itely index eb66ed5e3e..aef584f686 100644 --- a/Documentation/de/learning/tweaks.itely +++ b/Documentation/de/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Die Ausgabe verändern @chapter Die Ausgabe verändern @@ -4049,7 +4049,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4084,7 +4084,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4122,7 +4122,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4158,7 +4158,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4191,7 +4191,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4241,7 +4241,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4275,7 +4275,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/de/notation/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely index c121b4e13b..f7d689b260 100644 --- a/Documentation/de/notation/changing-defaults.itely +++ b/Documentation/de/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala @@ -4315,7 +4315,7 @@ Funktionen ist: @example Funktion = #(define-music-function - (parser location @var{Arg1} @var{Arg2} @dots{}) + (@var{Arg1} @var{Arg2} @dots{}) (@var{Typ1?} @var{Typ2?} @dots{}) #@{ @var{@dots{}Noten@dots{}} @@ -4398,7 +4398,7 @@ das Verschieben von @code{TextScript} erleichtert: @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding @@ -4419,7 +4419,7 @@ als Argumente für musikalische Funktionen eingesetzt werden: @lilypond[quote,verbatim,ragged-right] custosNote = #(define-music-function - (parser location note) + (note) (ly:music?) #{ \tweak NoteHead.stencil #ly:text-interface::print @@ -4438,7 +4438,7 @@ werden: @lilypond[quote,verbatim,ragged-right] tempoPadded = #(define-music-function - (parser location padding tempotext) + (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely index 2d4765e594..9b43f81c60 100644 --- a/Documentation/de/notation/input.itely +++ b/Documentation/de/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala @@ -1631,7 +1631,7 @@ einer Oper in das Inhaltsverzeichnis aufzunehmen: } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) @end verbatim @@ -1646,7 +1646,7 @@ tocAct = } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) \book { diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely index 3a3ad6d340..b1dd292d50 100644 --- a/Documentation/de/notation/pitches.itely +++ b/Documentation/de/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala @@ -2658,7 +2658,7 @@ Die folgende Notlösung kann benutzt werden: Man definiert eine Funktion, die den Versetzungszeichenstil kurzzeitig auf @code{forget} umschaltet: @lilypond[verbatim,quote] -forget = #(define-music-function (parser location music) (ly:music?) #{ +forget = #(define-music-function (music) (ly:music?) #{ \accidentalStyle forget #music \accidentalStyle modern diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely index 90f730c04e..4b8a5b3fef 100644 --- a/Documentation/de/notation/spacing.itely +++ b/Documentation/de/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Till Paala @@ -2024,7 +2024,7 @@ staffAffinityDown = \with { } labelContext = #(define-music-function - (parser location context) + (context) (string?) #{ s1*0^\markup { \typewriter #context } #}) diff --git a/Documentation/es/extending/programming-interface.itely b/Documentation/es/extending/programming-interface.itely index b0b8e805c3..df13c07eac 100644 --- a/Documentation/es/extending/programming-interface.itely +++ b/Documentation/es/extending/programming-interface.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Interfaces para programadores @chapter Interfaces para programadores @@ -55,7 +55,7 @@ Los bloques de código de LilyPond tienen el siguiente aspecto: He aquí un ejemplo trivial: @lilypond[verbatim,quote] -ritpp = #(define-event-function (parser location) () +ritpp = #(define-event-function () () #{ ^"rit." \pp #} ) @@ -127,7 +127,7 @@ La forma general de la definición de una función de Scheme es: @example funcion = #(define-scheme-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{tipo1?} @var{tipo2?} @dots{}) @var{cuerpo}) @end example @@ -307,7 +307,7 @@ satisface el predicado @code{void?}. @example noApuntarYPulsar = #(define-void-function - (parser location) + () () (ly:set-option 'point-and-click #f)) @dots{} @@ -359,7 +359,7 @@ La forma general para definir funciones musicales es: @example funcion = #(define-music-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{tipo1?} @var{tipo2?} @dots{}) @var{cuerpo}) @end example @@ -444,7 +444,7 @@ usando una variable @code{pair?}: @example barraManual = #(define-music-function - (parser location principio-final) + (principio-final) (pair?) #@{ \once \override Beam.positions = #principio-final @@ -462,7 +462,7 @@ para crear la pareja se puede incluir dentro de la expresión musical: @lilypond[quote,verbatim,ragged-right] manualBeam = #(define-music-function - (parser location beg end) + (beg end) (number? number?) #{ \once \override Beam.positions = #(cons beg end) @@ -517,7 +517,7 @@ se habrían fijado los valores predeterminados. @example crossStaff = -#(define-music-function (parser location notes) (ly:music?) +#(define-music-function (notes) (ly:music?) (_i "Create cross-staff stems") #@{ \temporary \override Stem.cross-staff = #cross-staff-connect @@ -539,7 +539,7 @@ además de la simple sustitución: @lilypond[quote,verbatim,ragged-right] AltOn = #(define-music-function - (parser location mag) + (mag) (number?) #{ \override Stem.length = #(* 7.0 mag) @@ -565,7 +565,7 @@ musicales: @lilypond[quote,verbatim,ragged-right] withAlt = #(define-music-function - (parser location mag music) + (mag music) (number? ly:music?) #{ \override Stem.length = #(* 7.0 mag) @@ -600,7 +600,7 @@ función musical sin argumentos: @example mostrarNumeroDeCompas = #(define-music-function - (parser location) + () () (if (eq? #t (ly:get-option 'display-bar-numbers)) #@{ \once \override Score.BarNumber.break-visibility = ##f #@} @@ -643,7 +643,7 @@ habitualmente sin indicador de dirección, como @code{c'\pp}. He aquí una forma de escribir indicaciones dinámicas arbitrarias: @lilypond[quote,verbatim,ragged-right] -dyn=#(define-event-function (parser location arg) (markup?) +dyn=#(define-event-function (arg) (markup?) (make-dynamic-script arg)) \relative { c'\dyn pfsss } @end lilypond diff --git a/Documentation/es/extending/scheme-tutorial.itely b/Documentation/es/extending/scheme-tutorial.itely index 479c62c95e..6483a5b75e 100644 --- a/Documentation/es/extending/scheme-tutorial.itely +++ b/Documentation/es/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Tutorial de Scheme @appendix Tutorial de Scheme @@ -1431,7 +1431,7 @@ que pongamos otro elemento delante de la propiedad @example -doubleSlur = #(define-music-function (parser location note) (ly:music?) +doubleSlur = #(define-music-function (note) (ly:music?) "Return: @{ note ( note ) @}. `note' is supposed to be a single note." (let ((note2 (ly:music-deep-copy note))) @@ -1616,7 +1616,7 @@ musical (es cuestión de un poco de aderezo sintáctico y una declaración del tipo de su único argumento @q{real}). @example -addAccent = #(define-music-function (parser location note-event) +addAccent = #(define-music-function (note-event) (ly:music?) "Add an accent ArticulationEvent to the articulations of `note-event', which is supposed to be a NoteEvent expression." @@ -1660,7 +1660,7 @@ TODO Find a simple example @ignore @lilypond[quote,verbatim,ragged-right] -padText = #(define-music-function (parser location padding) (number?) +padText = #(define-music-function (padding) (number?) #{ \once \override TextScript.padding = #padding #}) @@ -1683,7 +1683,7 @@ Lo podemos usar para crear instrucciones nuevas: @lilypond[quote,verbatim,ragged-right] -tempoPadded = #(define-music-function (parser location padding tempotext) +tempoPadded = #(define-music-function (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding @@ -1702,7 +1702,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext) Incluso se le pueden pasar expresiones musicales: @lilypond[quote,verbatim,ragged-right] -pattern = #(define-music-function (parser location x y) (ly:music? ly:music?) +pattern = #(define-music-function (x y) (ly:music? ly:music?) #{ #x e8 a b #y b a e #}) diff --git a/Documentation/es/learning/fundamental.itely b/Documentation/es/learning/fundamental.itely index 11501137a8..0ceb6e34db 100644 --- a/Documentation/es/learning/fundamental.itely +++ b/Documentation/es/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Conceptos fundamentales @chapter Conceptos fundamentales @@ -3183,7 +3183,7 @@ ellas como en funciones). @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/es/learning/tweaks.itely b/Documentation/es/learning/tweaks.itely index a339dff428..7421001b67 100644 --- a/Documentation/es/learning/tweaks.itely +++ b/Documentation/es/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Trucar la salida @chapter Trucar la salida @@ -4306,7 +4306,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4338,7 +4338,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4374,7 +4374,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4407,7 +4407,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4437,7 +4437,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4485,7 +4485,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4516,7 +4516,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/es/notation/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely index 42f4101a88..baad9ae36f 100644 --- a/Documentation/es/notation/changing-defaults.itely +++ b/Documentation/es/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Translation of GIT committish: a43fe59b0205af99f84532935b103d0c064b4526 Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Cambiar los valores por omisión @chapter Cambiar los valores por omisión @@ -4774,7 +4774,7 @@ de LilyPond. La forma general de estas funciones es @example funcion = #(define-music-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{type1?} @var{type2?} @dots{}) #@{ @var{@dots{}música@dots{}} @@ -4854,7 +4854,7 @@ del relleno de un elemento de inscripción de texto TextScript: @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding @@ -4875,7 +4875,7 @@ para los argumentos de las funciones musicales: @lilypond[quote,verbatim,ragged-right] custosNote = #(define-music-function - (parser location note) + (note) (ly:music?) #{ \tweak NoteHead.stencil #ly:text-interface::print @@ -4893,7 +4893,7 @@ Se pueden definir funciones de sustitución con más de un argumento: @lilypond[quote,verbatim,ragged-right] tempoPadded = #(define-music-function - (parser location padding tempotext) + (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely index 465b7196b4..51e01af183 100644 --- a/Documentation/es/notation/input.itely +++ b/Documentation/es/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Entrada y salida generales @chapter Entrada y salida generales @@ -1872,7 +1872,7 @@ nombres de los actos de una ópera en el índice general: } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) @end verbatim @@ -1887,7 +1887,7 @@ tocAct = } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) \book { diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely index 3e103596b3..98e83d3331 100644 --- a/Documentation/es/notation/pitches.itely +++ b/Documentation/es/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Alturas @@ -2697,7 +2697,7 @@ Se puede usar el siguiente rodeo del problema: definir una función que cambie localmente el estilo de alteraciones a @code{forget}: @lilypond[verbatim,quote] -forget = #(define-music-function (parser location music) (ly:music?) #{ +forget = #(define-music-function (music) (ly:music?) #{ \accidentalStyle forget #music \accidentalStyle modern diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely index 5e18d993c1..687c5f8e97 100644 --- a/Documentation/es/notation/spacing.itely +++ b/Documentation/es/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @ignore GDP TODO list @@ -2157,7 +2157,7 @@ lowerCaseChords = \with { } labelContext = #(define-music-function - (parser location context) + (context) (string?) #{ s1*0^\markup { \upright {\typewriter #context } } #}) diff --git a/Documentation/extending/programming-interface.itely b/Documentation/extending/programming-interface.itely index ebdfe0df38..c3afc53d94 100644 --- a/Documentation/extending/programming-interface.itely +++ b/Documentation/extending/programming-interface.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Interfaces for programmers @chapter Interfaces for programmers @@ -51,7 +51,7 @@ LilyPond code blocks look like Here is a trivial example: @lilypond[verbatim,quote] -ritpp = #(define-event-function (parser location) () +ritpp = #(define-event-function () () #{ ^"rit." \pp #} ) @@ -114,7 +114,7 @@ The general form for defining scheme functions is: @example function = #(define-scheme-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{type1?} @var{type2?} @dots{}) @var{body}) @end example @@ -262,7 +262,7 @@ sure that this special value (the only value satisfying the predicate @example noPointAndClick = #(define-void-function - (parser location) + () () (ly:set-option 'point-and-click #f)) @dots{} @@ -311,7 +311,7 @@ The general form for defining music functions is: @example function = #(define-music-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{type1?} @var{type2?} @dots{}) @var{body}) @end example @@ -387,7 +387,7 @@ using a @code{pair?} variable: @example manualBeam = #(define-music-function - (parser location beg-end) + (beg-end) (pair?) #@{ \once \override Beam.positions = #beg-end @@ -406,7 +406,7 @@ music expression: @lilypond[quote,verbatim,ragged-right] manualBeam = #(define-music-function - (parser location beg end) + (beg end) (number? number?) #{ \once \override Beam.positions = #(cons beg end) @@ -455,7 +455,7 @@ set on exit. @example crossStaff = -#(define-music-function (parser location notes) (ly:music?) +#(define-music-function (notes) (ly:music?) (_i "Create cross-staff stems") #@{ \temporary \override Stem.cross-staff = #cross-staff-connect @@ -476,7 +476,7 @@ addition to simple substitution, @lilypond[quote,verbatim,ragged-right] AltOn = #(define-music-function - (parser location mag) + (mag) (number?) #{ \override Stem.length = #(* 7.0 mag) @@ -501,7 +501,7 @@ This example may be rewritten to pass in music expressions, @lilypond[quote,verbatim,ragged-right] withAlt = #(define-music-function - (parser location mag music) + (mag music) (number? ly:music?) #{ \override Stem.length = #(* 7.0 mag) @@ -535,7 +535,7 @@ without arguments, @example displayBarNum = #(define-music-function - (parser location) + () () (if (eq? #t (ly:get-option 'display-bar-numbers)) #@{ \once \override Score.BarNumber.break-visibility = ##f #@} @@ -572,7 +572,7 @@ to write dynamics commands, those are usually attached without direction indicator, like @code{c'\pp}. Here is a way to write arbitrary dynamics: @lilypond[quote,verbatim,ragged-right] -dyn=#(define-event-function (parser location arg) (markup?) +dyn=#(define-event-function (arg) (markup?) (make-dynamic-script arg)) \relative { c'\dyn pfsss } @end lilypond @@ -1239,7 +1239,7 @@ restrict the modifications to a single music block. Notice how @lilypond[quote,verbatim] desaturate = #(define-music-function - (parser location music) (ly:music?) + (music) (ly:music?) #{ \applyContext #(lambda (context) diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely index 32915e07b1..8588ff2685 100644 --- a/Documentation/extending/scheme-tutorial.itely +++ b/Documentation/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Scheme tutorial @chapter Scheme tutorial @@ -1331,7 +1331,7 @@ property, it is useful to know that an unset property is read out as put another element at the front of the @code{articulations} property. @example -doubleSlur = #(define-music-function (parser location note) (ly:music?) +doubleSlur = #(define-music-function (note) (ly:music?) "Return: @{ note ( note ) @}. `note' is supposed to be a single note." (let ((note2 (ly:music-deep-copy note))) @@ -1507,7 +1507,7 @@ function (a matter of some syntactic sugar and a declaration of the type of its sole @q{real} argument). @example -addAccent = #(define-music-function (parser location note-event) +addAccent = #(define-music-function (note-event) (ly:music?) "Add an accent ArticulationEvent to the articulations of `note-event', which is supposed to be a NoteEvent expression." @@ -1552,7 +1552,7 @@ TODO Find a simple example @ignore @lilypond[quote,verbatim,ragged-right] -padText = #(define-music-function (parser location padding) (number?) +padText = #(define-music-function (padding) (number?) #{ \once \override TextScript.padding = #padding #}) @@ -1575,7 +1575,7 @@ We can use it to create new commands: @lilypond[quote,verbatim,ragged-right] -tempoPadded = #(define-music-function (parser location padding tempotext) +tempoPadded = #(define-music-function (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding @@ -1594,7 +1594,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext) Even music expressions can be passed in: @lilypond[quote,verbatim,ragged-right] -pattern = #(define-music-function (parser location x y) (ly:music? ly:music?) +pattern = #(define-music-function (x y) (ly:music? ly:music?) #{ #x e8 a b #y b a e #}) diff --git a/Documentation/fr/extending/programming-interface.itely b/Documentation/fr/extending/programming-interface.itely index 3589aa8ffc..155522e5bb 100644 --- a/Documentation/fr/extending/programming-interface.itely +++ b/Documentation/fr/extending/programming-interface.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Gilles Thibault @@ -60,7 +60,7 @@ Les blocs de code LilyPond ressemblent à En voici un exemple basique : @lilypond[verbatim,quote] -ritpp = #(define-event-function (parser location) () +ritpp = #(define-event-function () () #{ ^"rit." \pp #} ) @@ -132,7 +132,7 @@ D'une manière générale, une fonction Scheme se définit ainsi : @example fonction = #(define-scheme-function - (parser location @var{arg1} @var{arg2}@dots{}) + (@var{arg1} @var{arg2}@dots{}) (@var{type1?} @var{type2?}@dots{}) @var{corps}) @end example @@ -304,7 +304,7 @@ valeur spéciale -- la seule valeur qui satisfasse au prédicat @example noPointAndClick = #(define-void-function - (parser location) + () () (ly:set-option 'point-and-click #f)) @dots{} @@ -359,7 +359,7 @@ Une fonction musicale se définit ainsi : @example fonction = #(define-music-function - (parser location @var{arg1} @var{arg2}@dots{}) + (@var{arg1} @var{arg2}@dots{}) (@var{type1?} @var{type2?}@dots{}) @var{corps}) @end example @@ -449,7 +449,7 @@ l'aide d'une variable @code{pair?} : @example manualBeam = #(define-music-function - (parser location beg-end) + (beg-end) (pair?) #@{ \once \override Beam.positions = #beg-end @@ -467,7 +467,7 @@ pourra alors être inclus dans l'expression musicale : @lilypond[quote,verbatim,ragged-right] manualBeam = #(define-music-function - (parser location beg end) + (beg end) (number? number?) #{ \once \override Beam.positions = #(cons beg end) @@ -519,7 +519,7 @@ auraient retrouvé leurs valeurs par défaut à la sortie de la fonction. @example crossStaff = -#(define-music-function (parser location notes) (ly:music?) +#(define-music-function (notes) (ly:music?) (_i "Create cross-staff stems") #@{ \temporary \override Stem.cross-staff = #cross-staff-connect @@ -541,7 +541,7 @@ une part de programmation en Scheme. @lilypond[quote,verbatim,ragged-right] AltOn = #(define-music-function - (parser location mag) + (mag) (number?) #{ \override Stem.length = #(* 7.0 mag) @@ -567,7 +567,7 @@ s'applique à une expression musicale : @lilypond[quote,verbatim,ragged-right] withAlt = #(define-music-function - (parser location mag music) + (mag music) (number? ly:music?) #{ \override Stem.length = #(* 7.0 mag) @@ -602,7 +602,7 @@ fonction sans argument comme ici, @example displayBarNum = #(define-music-function - (parser location) + () () (if (eq? #t (ly:get-option 'display-bar-numbers)) #@{ \once \override Score.BarNumber.break-visibility = ##f #@} @@ -649,7 +649,7 @@ dans @code{c'\pp}. Voici de quoi vous permettre de mentionner n'importe quelle nuance : @lilypond[quote,verbatim,ragged-right] -dyn=#(define-event-function (parser location arg) (markup?) +dyn=#(define-event-function (arg) (markup?) (make-dynamic-script arg)) \relative { c'\dyn pfsss } @end lilypond @@ -1362,7 +1362,7 @@ comment @code{ly:context-pushpop-property} est utilisé à la fois pour un @lilypond[quote,verbatim] desaturate = #(define-music-function - (parser location music) (ly:music?) + (music) (ly:music?) #{ \applyContext #(lambda (context) diff --git a/Documentation/fr/extending/scheme-tutorial.itely b/Documentation/fr/extending/scheme-tutorial.itely index b9cdb23505..22c9c1c6ef 100644 --- a/Documentation/fr/extending/scheme-tutorial.itely +++ b/Documentation/fr/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Jean-Charles Malahieude @@ -1472,7 +1472,7 @@ vide), aucune vérification n'est requise avant d'introduire un nouvel élément en tête de la propriété @code{articulations}. @example -doubleSlur = #(define-music-function (parser location note) (ly:music?) +doubleSlur = #(define-music-function (note) (ly:music?) "Renvoie : @{ note ( note ) @}. `note' est censé être une note unique." (let ((note2 (ly:music-deep-copy note))) @@ -1656,7 +1656,7 @@ fonction musicale, à l'aide d'un peu d'enrobage syntaxique et mention du type de son unique argument « réel ». @example -ajouteAccent = #(define-music-function (parser location note-event) +ajouteAccent = #(define-music-function (note-event) (ly:music?) "Ajoute un accent (ArticulationEvent) aux articulations de `note-event', qui est censé être une expression NoteEvent." @@ -1699,7 +1699,7 @@ TODO Find a simple example @ignore @lilypond[quote,verbatim,ragged-right] -padText = #(define-music-function (parser location padding) (number?) +padText = #(define-music-function (padding) (number?) #{ \once \override TextScript.padding = #padding #}) @@ -1722,7 +1722,7 @@ We can use it to create new commands: @lilypond[quote,verbatim,ragged-right] -tempoPadded = #(define-music-function (parser location padding tempotext) +tempoPadded = #(define-music-function (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding @@ -1741,7 +1741,7 @@ tempoPadded = #(define-music-function (parser location padding tempotext) Even music expressions can be passed in: @lilypond[quote,verbatim,ragged-right] -pattern = #(define-music-function (parser location x y) (ly:music? ly:music?) +pattern = #(define-music-function (x y) (ly:music? ly:music?) #{ #x e8 a b $y b a e #}) diff --git a/Documentation/fr/learning/fundamental.itely b/Documentation/fr/learning/fundamental.itely index 1d8bb6b399..ac5d106232 100644 --- a/Documentation/fr/learning/fundamental.itely +++ b/Documentation/fr/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: John Mandereau @@ -3147,7 +3147,7 @@ pouvez les voir comme des fonctions. @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/fr/learning/tweaks.itely b/Documentation/fr/learning/tweaks.itely index fc80e7cdff..329a663a65 100644 --- a/Documentation/fr/learning/tweaks.itely +++ b/Documentation/fr/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Valentin Villenave, Nicolas Klutchnikoff, Damien Heurtebise @c Translation checkers: Jean-Charles Malahieude, John Mandereau @@ -4318,7 +4318,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4349,7 +4349,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4386,7 +4386,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4420,7 +4420,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4450,7 +4450,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4498,7 +4498,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4529,7 +4529,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/fr/notation/changing-defaults.itely b/Documentation/fr/notation/changing-defaults.itely index 1250cfdfb1..aa4a1c92d8 100644 --- a/Documentation/fr/notation/changing-defaults.itely +++ b/Documentation/fr/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Gilles Thibault @@ -4907,7 +4907,7 @@ forme @example fonction = #(define-music-function - (parser location @var{arg1} @var{arg2}@dots{}) + (@var{arg1} @var{arg2}@dots{}) (@var{type1?} @var{type2?}@dots{}) #@{ @var{@dots{}musique@dots{}} @@ -4989,7 +4989,7 @@ simplifier le réglage du décalage d'une annotation (un @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding @@ -5010,7 +5010,7 @@ fonction, y compris une expression musicale : @lilypond[quote,verbatim,ragged-right] custosNote = #(define-music-function - (parser location note) + (note) (ly:music?) #{ \tweak NoteHead.stencil #ly:text-interface::print @@ -5028,7 +5028,7 @@ Une fonction de substitution peut traiter plusieurs arguments : @lilypond[quote,verbatim,ragged-right] tempoPadded = #(define-music-function - (parser location padding tempotext) + (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely index 44596972c3..dc89200c7d 100644 --- a/Documentation/fr/notation/input.itely +++ b/Documentation/fr/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Jean-Charles Malahieude, Valentin Villenave @@ -1876,7 +1876,7 @@ le but de mentionner les actes dans la table des matières d'un opéra : } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) @end verbatim @@ -1891,7 +1891,7 @@ tocAct = } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) \book { diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely index 7e5b1dc65f..8393fef11b 100644 --- a/Documentation/fr/notation/pitches.itely +++ b/Documentation/fr/notation/pitches.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Frédéric Chiasson @c Translation checkers: Valentin Villenave, Jean-Charles Malahieude @@ -2814,7 +2814,7 @@ L'astuce suivante, qui définit temporairement le recours au style @code{forget}, permet d'obtenir quelque chose de présentable. @lilypond[verbatim,quote] -forget = #(define-music-function (parser location music) (ly:music?) #{ +forget = #(define-music-function (music) (ly:music?) #{ \accidentalStyle forget #music \accidentalStyle modern diff --git a/Documentation/fr/notation/spacing.itely b/Documentation/fr/notation/spacing.itely index b58658f579..a233d1593e 100644 --- a/Documentation/fr/notation/spacing.itely +++ b/Documentation/fr/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude @@ -2090,7 +2090,7 @@ lowerCaseChords = \with { } labelContext = #(define-music-function - (parser location context) + (context) (string?) #{ s1*0^\markup { \upright {\typewriter #context } } #}) diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely index 100f69c5a4..b021f69012 100644 --- a/Documentation/hu/learning/fundamental.itely +++ b/Documentation/hu/learning/fundamental.itely @@ -11,7 +11,7 @@ @c Translators: Griechisch Erika, Harmath Dénes @c -*- coding: utf-8; mode: texinfo; -*- -@c \version "2.19.21" +@c \version "2.19.22" @node Alapfogalmak @chapter Alapfogalmak @translationof Fundamental concepts @@ -3065,7 +3065,7 @@ can think of these as functions). @lilypond[quote,verbatim,ragged-right] padText = -#(define-music-function (parser location padding) (number?) +#(define-music-function (padding) (number?) #{ \once \override TextScript.padding = #padding #}) diff --git a/Documentation/included/display-predefined-string-tunings.ly b/Documentation/included/display-predefined-string-tunings.ly index 455d953757..fd3df5378a 100644 --- a/Documentation/included/display-predefined-string-tunings.ly +++ b/Documentation/included/display-predefined-string-tunings.ly @@ -1,4 +1,4 @@ -\version "2.17.11" +\version "2.19.22" #(define (filter-instrument instrument-name tuning-alist) (filter (lambda (entry) @@ -21,7 +21,7 @@ pitches))))) displayInstrumentDefaultTunings = -#(define-music-function (parser location instrument) (string?) +#(define-music-function (instrument) (string?) (let* ((filtered-instruments (filter-instrument instrument defaultStringTunings)) (display-elements (map chord-display filtered-instruments))) (make-music 'SequentialMusic 'elements display-elements))) diff --git a/Documentation/included/script-chart.ly b/Documentation/included/script-chart.ly index 7ed10a91c5..853b07179f 100644 --- a/Documentation/included/script-chart.ly +++ b/Documentation/included/script-chart.ly @@ -1,4 +1,4 @@ -\version "2.17.30" +\version "2.19.22" \header { texidoc ="@cindex Feta scripts @@ -185,9 +185,9 @@ This chart shows all articulations, or scripts, that the feta font contains. scriptStaff = -#(define-music-function (parser location scripts) (list?) +#(define-music-function (scripts) (list?) (make-scripts-staff scripts)) scriptStaffAncient = -#(define-music-function (parser location scripts) (list?) +#(define-music-function (scripts) (list?) (make-scripts-staff-ancient scripts)) diff --git a/Documentation/it/learning/fundamental.itely b/Documentation/it/learning/fundamental.itely index 6eaa3ecf66..339b57a644 100644 --- a/Documentation/it/learning/fundamental.itely +++ b/Documentation/it/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Concetti fondamentali @chapter Concetti fondamentali @@ -3075,7 +3075,7 @@ immaginare come una funzione). @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/it/learning/tweaks.itely b/Documentation/it/learning/tweaks.itely index 53abe0f8cf..bcf6188fa9 100644 --- a/Documentation/it/learning/tweaks.itely +++ b/Documentation/it/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Modifica dell'output @chapter Modifica dell'output @@ -4217,7 +4217,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4248,7 +4248,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4282,7 +4282,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4314,7 +4314,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4344,7 +4344,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4391,7 +4391,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4422,7 +4422,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/it/notation/pitches.itely b/Documentation/it/notation/pitches.itely index f64bed5675..125f27454c 100644 --- a/Documentation/it/notation/pitches.itely +++ b/Documentation/it/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Federico Bruni @c Translation checkers: Luca Rossetto Casel @@ -2840,7 +2840,7 @@ Si può usare il seguente espediente: si definisce una funzione che imposti localmente lo stile delle alterazioni su @code{forget}: @lilypond[verbatim,quote] -forget = #(define-music-function (parser location music) (ly:music?) #{ +forget = #(define-music-function (music) (ly:music?) #{ \accidentalStyle forget #music \accidentalStyle modern diff --git a/Documentation/ja/learning/fundamental.itely b/Documentation/ja/learning/fundamental.itely index 655facf07f..20a448e32b 100644 --- a/Documentation/ja/learning/fundamental.itely +++ b/Documentation/ja/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -3170,7 +3170,7 @@ LilyPond は非静的な置き換えも処理できます (それらを関数と @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/ja/learning/tweaks.itely b/Documentation/ja/learning/tweaks.itely index 257dae26e1..90fb878dd9 100644 --- a/Documentation/ja/learning/tweaks.itely +++ b/Documentation/ja/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -4070,7 +4070,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4104,7 +4104,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4143,7 +4143,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4180,7 +4180,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4213,7 +4213,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4265,7 +4265,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4299,7 +4299,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely index 4a13713095..d43301eef9 100644 --- a/Documentation/ja/notation/changing-defaults.itely +++ b/Documentation/ja/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -4562,7 +4562,7 @@ smartSquareLineCircleSpace = { @example function = #(define-music-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{type1?} @var{type2?} @dots{}) #@{ @var{@dots{}music@dots{}} @@ -4638,7 +4638,7 @@ symbol? @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = $padding @@ -4658,7 +4658,7 @@ padText = @lilypond[quote,verbatim,ragged-right] custosNote = #(define-music-function - (parser location note) + (note) (ly:music?) #{ \tweak NoteHead.stencil #ly:text-interface::print @@ -4676,7 +4676,7 @@ custosNote = @lilypond[quote,verbatim,ragged-right] tempoPadded = #(define-music-function - (parser location padding tempotext) + (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = $padding diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely index 7618f41f03..431b62b6e5 100644 --- a/Documentation/ja/notation/input.itely +++ b/Documentation/ja/notation/input.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @@ -1656,7 +1656,7 @@ book のページ数が 10 から 99 までの範囲であるのなら、ゲー } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) @end verbatim @@ -1671,7 +1671,7 @@ tocAct = } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) \book { diff --git a/Documentation/ja/notation/pitches.itely b/Documentation/ja/notation/pitches.itely index 8b7097676c..dbf6789c95 100644 --- a/Documentation/ja/notation/pitches.itely +++ b/Documentation/ja/notation/pitches.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -2676,7 +2676,7 @@ musicB = { 局部的に臨時記号スタイルを @code{forget} に変更する関数を定義します: @lilypond[verbatim,quote] -forget = #(define-music-function (parser location music) (ly:music?) #{ +forget = #(define-music-function (music) (ly:music?) #{ \accidentalStyle forget #music \accidentalStyle modern diff --git a/Documentation/ja/notation/spacing.itely b/Documentation/ja/notation/spacing.itely index 2bd86c66ae..215d588114 100644 --- a/Documentation/ja/notation/spacing.itely +++ b/Documentation/ja/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @c Translators: Yoshiki Sawada @@ -2020,7 +2020,7 @@ staffAffinityDown = \with { } labelContext = #(define-music-function - (parser location context) + (context) (string?) #{ s1*0^\markup { \typewriter #context } #}) diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index e895d268ca..8f3076bc4a 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Fundamental concepts @chapter Fundamental concepts @@ -3071,7 +3071,7 @@ can think of these as functions). @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index 5d0f8fd287..e182f2c710 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Tweaking output @chapter Tweaking output @@ -4116,7 +4116,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4146,7 +4146,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -4181,7 +4181,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4213,7 +4213,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4243,7 +4243,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4291,7 +4291,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4322,7 +4322,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/ly-examples/aucun-snippet.ly b/Documentation/ly-examples/aucun-snippet.ly index 5dbdcb71a1..e8e6d538fb 100644 --- a/Documentation/ly-examples/aucun-snippet.ly +++ b/Documentation/ly-examples/aucun-snippet.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \include "example-header.ily" \paper { @@ -130,7 +130,7 @@ global = { } %%%%%%%%% MACRO FOR MAKING SLASHES THROUGH STEMS %%%%%%%%%% -MakeSlash = #(define-music-function (parser location angle len-left len-right +MakeSlash = #(define-music-function (angle len-left len-right thick y-factor offset) (number? number? number? number? number? pair?) diff --git a/Documentation/ly-examples/cary-layout.ily b/Documentation/ly-examples/cary-layout.ily index 66c6a7fbd3..dd3858b43c 100644 --- a/Documentation/ly-examples/cary-layout.ily +++ b/Documentation/ly-examples/cary-layout.ily @@ -1,5 +1,5 @@ -\version "2.19.12" +\version "2.19.22" \layout { indent = #0 @@ -61,7 +61,7 @@ sfpp = #(make-dynamic-script "sfpp") sffp = #(make-dynamic-script "sffp") sffpp = #(make-dynamic-script "sffpp") -beam = #(define-music-function (parser location left right) (number? number?) +beam = #(define-music-function (left right) (number? number?) (cond ((and (= left 0) (> right 0)) #{ \set stemRightBeamCount = #right @@ -80,32 +80,32 @@ beam = #(define-music-function (parser location left right) (number? number?) ) ) -fraction = #(define-music-function (parser location music) (ly:music?) +fraction = #(define-music-function (music) (ly:music?) #{ \tweak text #tuplet-number::calc-fraction-text #music #}) -triangle = #(define-music-function (parser location music) (ly:music?) +triangle = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(do do do do do do do) #music #}) -semicircle = #(define-music-function (parser location music) (ly:music?) +semicircle = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(re re re re re re re) #music #}) -blackdiamond = #(define-music-function (parser location music) (ly:music?) +blackdiamond = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(mi mi mi mi mi mi mi) #music #}) -tiltedtriangle = #(define-music-function (parser location music) (ly:music?) +tiltedtriangle = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(fa fa fa fa fa fa fa) #music #}) -square = #(define-music-function (parser location music) (ly:music?) +square = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(la la la la la la la) #music #}) -wedge = #(define-music-function (parser location music) (ly:music?) +wedge = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(ti ti ti ti ti ti ti) #music #}) -harmonic = #(define-music-function (parser location music) (ly:music?) +harmonic = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(harmonic harmonic harmonic harmonic harmonic harmonic harmonic) #music #}) -cross = #(define-music-function (parser location music) (ly:music?) +cross = #(define-music-function (music) (ly:music?) #{ \once \set shapeNoteStyles = ##(cross cross cross cross cross cross cross) #music #}) -white = #(define-music-function (parser location music) (ly:music?) +white = #(define-music-function (music) (ly:music?) #{ \once \override NoteHead.duration-log = #1 #music #}) diff --git a/Documentation/nl/learning/fundamental.itely b/Documentation/nl/learning/fundamental.itely index a7058f5b39..5a7b90b000 100644 --- a/Documentation/nl/learning/fundamental.itely +++ b/Documentation/nl/learning/fundamental.itely @@ -12,7 +12,7 @@ @c Translation checker: @c Translation checker committish: -@c \version "2.19.21" +@c \version "2.19.22" @node Fundamentele concepten @translationof Fundamental concepts @@ -3088,7 +3088,7 @@ can think of these as functions). @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding diff --git a/Documentation/nl/learning/tweaks.itely b/Documentation/nl/learning/tweaks.itely index a97b9cde42..530f64ed28 100644 --- a/Documentation/nl/learning/tweaks.itely +++ b/Documentation/nl/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Tweaking output @chapter Tweaking output @@ -3849,7 +3849,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -3882,7 +3882,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @end example @@ -3920,7 +3920,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -3955,7 +3955,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -3988,7 +3988,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) @@ -4039,7 +4039,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #@{ <>^\markup \bold \box #string #@}) @@ -4073,7 +4073,7 @@ mpdolce = inst = #(define-music-function - (parser location string) + (string) (string?) #{ <>^\markup \bold \box #string #}) diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index 08c3fba366..f64396f502 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Changing defaults @chapter Changing defaults @@ -4610,7 +4610,7 @@ code is easy. The general form of these functions is @example function = #(define-music-function - (parser location @var{arg1} @var{arg2} @dots{}) + (@var{arg1} @var{arg2} @dots{}) (@var{type1?} @var{type2?} @dots{}) #@{ @var{@dots{}music@dots{}} @@ -4688,7 +4688,7 @@ setting the padding of a TextScript: @lilypond[quote,verbatim,ragged-right] padText = #(define-music-function - (parser location padding) + (padding) (number?) #{ \once \override TextScript.padding = #padding @@ -4709,7 +4709,7 @@ as notes for arguments to music functions: @lilypond[quote,verbatim,ragged-right] custosNote = #(define-music-function - (parser location note) + (note) (ly:music?) #{ \tweak NoteHead.stencil #ly:text-interface::print @@ -4727,7 +4727,7 @@ Substitution functions with multiple arguments can be defined: @lilypond[quote,verbatim,ragged-right] tempoPadded = #(define-music-function - (parser location padding tempotext) + (padding tempotext) (number? markup?) #{ \once \override Score.MetronomeMark.padding = #padding diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 14a4202f39..5276946592 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node General input and output @chapter General input and output @@ -1763,7 +1763,7 @@ in the table of contents of an opera: } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) @end verbatim @@ -1778,7 +1778,7 @@ tocAct = } tocAct = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) (add-toc-item! 'tocActMarkup text)) \book { diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely index 19c1f6f762..ffa4e33b0b 100644 --- a/Documentation/notation/pitches.itely +++ b/Documentation/notation/pitches.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @node Pitches @@ -2845,7 +2845,7 @@ The following work-around can be used: define a function that locally changes the accidental style to @code{forget}: @lilypond[verbatim,quote] -forget = #(define-music-function (parser location music) (ly:music?) #{ +forget = #(define-music-function (music) (ly:music?) #{ \accidentalStyle forget #music \accidentalStyle modern diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index f8859d04c8..db9f9ff3c1 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.21" +@c \version "2.19.22" @ignore GDP TODO list @@ -1949,7 +1949,7 @@ lowerCaseChords = \with { } labelContext = #(define-music-function - (parser location context) + (context) (string?) #{ s1*0^\markup { \upright {\typewriter #context } } #}) diff --git a/Documentation/snippets/adding-extra-fingering-with-scheme.ly b/Documentation/snippets/adding-extra-fingering-with-scheme.ly index 7c7a7b9dbc..c93557a36b 100644 --- a/Documentation/snippets/adding-extra-fingering-with-scheme.ly +++ b/Documentation/snippets/adding-extra-fingering-with-scheme.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "scheme-language" @@ -22,7 +22,7 @@ of the music for you. } % begin verbatim addScript = -#(define-music-function (parser location script music) +#(define-music-function (script music) (ly:event? ly:music?) (map-some-music (lambda (mus) diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly index f4d790c113..a03e901d16 100644 --- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly +++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "staff-notation, vocal-music" @@ -27,7 +27,7 @@ can be cued, but they cannot overlap each other in time. cueWhile = #(define-music-function - (parser location instrument name dir music) + (instrument name dir music) (string? string? ly:dir? ly:music?) #{ \cueDuring $instrument #dir { diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly index 9aea589ed2..2d08a1607e 100644 --- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly +++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "expressive-marks, really-cool, scheme-language, text" @@ -23,7 +23,7 @@ normally printed, using some Scheme code. } % begin verbatim hairpinWithCenteredText = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) #{ \once \override Voice.Hairpin.after-line-breaking = #(lambda (grob) diff --git a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly index 37000fda73..9d02ca5744 100644 --- a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly @@ -5,7 +5,7 @@ % % This file is in the public domain. %% Note: this file works from version 2.19.0 -\version "2.19.0" +\version "2.19.22" \header { lsrtags = "pitches, real-music, really-cool, scheme-language" @@ -23,7 +23,7 @@ Planets. rhythm = -#(define-music-function (parser location p) (ly:pitch?) +#(define-music-function (p) (ly:pitch?) "Make the rhythm in Mars (the Planets) at the given pitch" #{ \tuplet 3/2 { $p 8 8 8 } 4 4 8 8 4 #}) diff --git a/Documentation/snippets/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/creating-real-parenthesized-dynamics.ly index 8d6eec5122..5fbbe1f34f 100644 --- a/Documentation/snippets/creating-real-parenthesized-dynamics.ly +++ b/Documentation/snippets/creating-real-parenthesized-dynamics.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "expressive-marks, text, workaround" @@ -27,7 +27,7 @@ commands such as @code{\\dynamicUp} or @code{\\dynamicDown}. } % begin verbatim paren = -#(define-event-function (parser location dyn) (ly:event?) +#(define-event-function (dyn) (ly:event?) (make-dynamic-script #{ \markup \concat { \normal-text \italic \fontsize #2 ( diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly index f7264aa0f8..d88f5fbb50 100644 --- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly +++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "expressive-marks, tweaks-and-overrides" @@ -22,13 +22,13 @@ next note. % Two functions for (de)crescendo spanners where you can explicitly give the % spanner text. mycresc = -#(define-music-function (parser location mymarkup) (markup?) +#(define-music-function (mymarkup) (markup?) (make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text mymarkup)) mydecresc = -#(define-music-function (parser location mymarkup) (markup?) +#(define-music-function (mymarkup) (markup?) (make-music 'DecrescendoEvent 'span-direction START 'span-type 'text diff --git a/Documentation/snippets/extending-glissandi-across-repeats.ly b/Documentation/snippets/extending-glissandi-across-repeats.ly index bd18a741f4..698fc4a723 100644 --- a/Documentation/snippets/extending-glissandi-across-repeats.ly +++ b/Documentation/snippets/extending-glissandi-across-repeats.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "staff-notation, tweaks-and-overrides" @@ -24,7 +24,7 @@ corresponding grace notes in all other voices. doctitle = "Extending glissandi across repeats" } % begin verbatim -repeatGliss = #(define-music-function (parser location grace) +repeatGliss = #(define-music-function (grace) (ly:pitch?) #{ % the next two lines ensure the glissando is long enough diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly index c9ee89ee72..cdbe9fa6c2 100644 --- a/Documentation/snippets/flute-slap-notation.ly +++ b/Documentation/snippets/flute-slap-notation.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "contemporary-notation, winds" @@ -19,7 +19,7 @@ glyph. } % begin verbatim slap = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) #{ \override NoteHead.stencil = #(lambda (grob) diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly index 8b22956864..22de249b5e 100644 --- a/Documentation/snippets/fretted-headword.ly +++ b/Documentation/snippets/fretted-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "headword" @@ -30,7 +30,7 @@ ssnod = \set stringNumberOrientations = #'(down) ssnor = \set stringNumberOrientations = #'(right) % define fingering offset -FO = #(define-music-function (parser location offsetX offsetY) (number? number?) +FO = #(define-music-function (offsetX offsetY) (number? number?) #{ \once \override Voice.Fingering.extra-offset = #(cons offsetX offsetY) #}) diff --git a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly index d08471155e..6992cce160 100644 --- a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly +++ b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "automatic-notation, really-cool, scheme-language" @@ -99,8 +99,8 @@ modified to inser all collected scores so far to the book. (set! pitch (modulo (1+ pitch) 7))))) oneNoteScore = -#(define-music-function (parser location) () - (add-one-note-score parser) +#(define-music-function () () + (add-one-note-score (*parser*)) (make-music 'Music 'void #t)) %%% diff --git a/Documentation/snippets/isolated-percent-repeats.ly b/Documentation/snippets/isolated-percent-repeats.ly index c8fb9bc22f..45fe68edd7 100644 --- a/Documentation/snippets/isolated-percent-repeats.ly +++ b/Documentation/snippets/isolated-percent-repeats.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "repeats" @@ -17,7 +17,7 @@ Isolated percents can also be printed. } % begin verbatim makePercent = -#(define-music-function (parser location note) (ly:music?) +#(define-music-function (note) (ly:music?) "Make a percent repeat the same length as NOTE." (make-music 'PercentEvent 'length (ly:music-length note))) diff --git a/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly index 40c2af9b28..f24f238ecb 100644 --- a/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,4 +1,4 @@ -\version "2.19.0" +\version "2.19.22" \header { lsrtags = "pitches, real-music, really-cool, scheme-language" @@ -15,7 +15,7 @@ Planets. } rhythm = -#(define-music-function (parser location p) (ly:pitch?) +#(define-music-function (p) (ly:pitch?) "Make the rhythm in Mars (the Planets) at the given pitch" #{ \tuplet 3/2 { $p 8 8 8 } 4 4 8 8 4 #}) diff --git a/Documentation/snippets/overriding-articulations-of-destinct-type.ly b/Documentation/snippets/overriding-articulations-of-destinct-type.ly index 2d8707ca91..98bcefa5dd 100644 --- a/Documentation/snippets/overriding-articulations-of-destinct-type.ly +++ b/Documentation/snippets/overriding-articulations-of-destinct-type.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "scheme-language, tweaks-and-overrides" @@ -37,7 +37,7 @@ With 2.16.2 it is possible to put the proposed function, tweaks))))) customScripts = -#(define-music-function (parser location settings)(list?) +#(define-music-function (settings)(list?) #{ \override Script.before-line-breaking = #(custom-script-tweaks settings) diff --git a/Documentation/snippets/rhythmic-slashes.ly b/Documentation/snippets/rhythmic-slashes.ly index 4e140b330d..70ec77a604 100644 --- a/Documentation/snippets/rhythmic-slashes.ly +++ b/Documentation/snippets/rhythmic-slashes.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -35,7 +35,7 @@ rs = { } % Function to print a specified number of slashes -comp = #(define-music-function (parser location count) (integer?) +comp = #(define-music-function (count) (integer?) #{ \override Rest.stencil = #ly:percent-repeat-item-interface::beat-slash \override Rest.thickness = #0.48 diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly index f07285c8b7..badba96463 100644 --- a/Documentation/snippets/score-for-diatonic-accordion.ly +++ b/Documentation/snippets/score-for-diatonic-accordion.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "real-music, specific-notation, template" @@ -186,7 +186,7 @@ staffAccordionMel = } AltOn = -#(define-music-function (parser location mag) (number?) +#(define-music-function (mag) (number?) #{ \override Stem.length = #(* 7.0 mag) \override NoteHead.font-size = #(inexact->exact (* (/ 6.0 (log 2.0)) (log mag))) #}) diff --git a/Documentation/snippets/string-number-extender-lines.ly b/Documentation/snippets/string-number-extender-lines.ly index 5409fbaf4f..78f91075dd 100644 --- a/Documentation/snippets/string-number-extender-lines.ly +++ b/Documentation/snippets/string-number-extender-lines.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "editorial-annotations, fretted-strings, scheme-language, text, tweaks-and-overrides" @@ -18,7 +18,7 @@ series of notes is supposed to be played all on the same string. } % begin verbatim stringNumberSpanner = - #(define-music-function (parser location StringNumber) (string?) + #(define-music-function (StringNumber) (string?) #{ \override TextSpanner.style = #'solid \override TextSpanner.font-size = #-5 diff --git a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index ca5b7f24f6..51ebe92078 100644 --- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "pitches, scheme-language, workaround" @@ -74,7 +74,7 @@ In this manner, the most natural enharmonic notes are chosen. music)) naturalizeMusic = -#(define-music-function (parser location m) +#(define-music-function (m) (ly:music?) (naturalize m)) diff --git a/Documentation/snippets/using-tags-to-produce-mensural-and-modern-music-from-the-same-source.ly b/Documentation/snippets/using-tags-to-produce-mensural-and-modern-music-from-the-same-source.ly index 0d11f92cf9..607d3faa94 100644 --- a/Documentation/snippets/using-tags-to-produce-mensural-and-modern-music-from-the-same-source.ly +++ b/Documentation/snippets/using-tags-to-produce-mensural-and-modern-music-from-the-same-source.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.22" \header { lsrtags = "ancient-notation, vocal-music" @@ -25,7 +25,7 @@ is usually referred to as @code{transcription}. doctitle = "Using tags to produce mensural and modern music from the same source" } % begin verbatim -menrest = #(define-music-function (parser location note) +menrest = #(define-music-function (note) (ly:music?) #{ \tag #'mens $(make-music 'RestEvent note) diff --git a/input/regression/automatic-polyphony-context-id.ly b/input/regression/automatic-polyphony-context-id.ly index 22c838efaa..786c718942 100644 --- a/input/regression/automatic-polyphony-context-id.ly +++ b/input/regression/automatic-polyphony-context-id.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" \header { texidoc = "The bottom-level contexts in polyphony shorthand are @@ -10,7 +10,7 @@ This snippet will fail to compile if either voice has an invalid } assertContextId = -#(define-music-function (parser location id) (string?) +#(define-music-function (id) (string?) (let ((music (make-music 'ApplyContext 'procedure (lambda (ctx) diff --git a/input/regression/bar-number-volta-repeat.ly b/input/regression/bar-number-volta-repeat.ly index a8bb15491a..44b356da30 100644 --- a/input/regression/bar-number-volta-repeat.ly +++ b/input/regression/bar-number-volta-repeat.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header { texidoc = "Bar numbers can automatically reset at volta repeats. @@ -6,7 +6,7 @@ } musicWithBarNumberCheck = -#(define-music-function (parser location n) +#(define-music-function (n) (integer?) #{ \relative { diff --git a/input/regression/clef-transposition-placement.ly b/input/regression/clef-transposition-placement.ly index 4598cf4f34..256264ae81 100644 --- a/input/regression/clef-transposition-placement.ly +++ b/input/regression/clef-transposition-placement.ly @@ -1,4 +1,4 @@ -\version "2.18.0" +\version "2.19.22" \header { @@ -15,7 +15,7 @@ number should be centered." #(set-global-staff-size 35) clefVariations = -#(define-music-function (parser location type)(string?) +#(define-music-function (type)(string?) #{ \once \omit Staff.Clef s4 \override Staff.Clef.full-size-change = ##t diff --git a/input/regression/define-event-function.ly b/input/regression/define-event-function.ly index 4aa75b6b17..fcd8394e38 100644 --- a/input/regression/define-event-function.ly +++ b/input/regression/define-event-function.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header{ @@ -11,7 +11,7 @@ opposed to music functions, a direction indicator is not required." \layout { ragged-right = ##t } dynScript = -#(define-event-function (parser location text) (markup?) +#(define-event-function (text) (markup?) (make-dynamic-script text)) \relative { diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 7368dfae34..8a6a1a5c94 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" #(use-modules (srfi srfi-13) (ice-9 format)) @@ -27,7 +27,7 @@ (make-column-markup (string-split str #\NewLine))) test = -#(define-void-function (parser location harmless strings) +#(define-void-function (harmless strings) ((string?) pair?) (let ((input (car strings)) (output (cdr strings)) @@ -36,7 +36,7 @@ test = (if harmless (ly:progress "Test unequal: ~a.\nin = ~a\nout = ~a\n" harmless input output) - (ly:input-warning location "Test unequal: BUG.\nin = ~a\nout = ~a\n" + (ly:input-warning (*location*) "Test unequal: BUG.\nin = ~a\nout = ~a\n" input output))))) %%% diff --git a/input/regression/dynamics-custom-text-spanner-postfix.ly b/input/regression/dynamics-custom-text-spanner-postfix.ly index ee4132b80c..15c3d2510a 100644 --- a/input/regression/dynamics-custom-text-spanner-postfix.ly +++ b/input/regression/dynamics-custom-text-spanner-postfix.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header { texidoc = "Postfix functions for custom crescendo text spanners. The spanners @@ -8,10 +8,10 @@ otherwise the spanner start will rather be assigned to the next note." % Two functions for (de)crescendo spanners where you can explicitly give the % spanner text. -mycresc = #(define-music-function (parser location mymarkup) (string?) +mycresc = #(define-music-function (mymarkup) (string?) (make-music 'CrescendoEvent 'span-direction START 'span-type 'text 'span-text mymarkup)) -mydecresc = #(define-music-function (parser location mymarkup) (string?) +mydecresc = #(define-music-function (mymarkup) (string?) (make-music 'DecrescendoEvent 'span-direction START 'span-type 'text 'span-text mymarkup)) diff --git a/input/regression/event-listener-output.ly b/input/regression/event-listener-output.ly index fb9fb336f1..58eb5440d2 100644 --- a/input/regression/event-listener-output.ly +++ b/input/regression/event-listener-output.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header { texidoc = "Music events can be extracted from a score with event @@ -15,7 +15,7 @@ listeners." st = #(define-music-function - (parser location text) + (text) (string?) #{ \override TextSpanner.bound-details.left.text = $text diff --git a/input/regression/figured-bass-slashed-numbers.ly b/input/regression/figured-bass-slashed-numbers.ly index 73dce5c744..a810f594f6 100644 --- a/input/regression/figured-bass-slashed-numbers.ly +++ b/input/regression/figured-bass-slashed-numbers.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" \header { texidoc = "Figured bass supports numbers with slashes through @@ -25,7 +25,7 @@ bassfigures = \figuremode { #(define (adjust-slash-stencil-default num forward stencil mag) stencil) -unsetExceptions = #(define-void-function (parser location) () +unsetExceptions = #(define-void-function () () ; (set! horizontal-slash-interval horizontal-slash-interval-default) ; (set! adjust-slash-stencil adjust-slash-stencil-default) ) diff --git a/input/regression/flags-straight-stockhausen-boulez.ly b/input/regression/flags-straight-stockhausen-boulez.ly index 17ab7e2b0d..6440bb081e 100644 --- a/input/regression/flags-straight-stockhausen-boulez.ly +++ b/input/regression/flags-straight-stockhausen-boulez.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.22" \header { texidoc = "Flags can be drawn straight in the style used by @@ -7,7 +7,7 @@ Stockhausen and Boulez. } -stemLength = #(define-music-function (parser location length) (number?) +stemLength = #(define-music-function (length) (number?) "Set the length of the next stem explicitly." #{ \once \override Stem.length-fraction = #length diff --git a/input/regression/identifier-following-chordmode.ly b/input/regression/identifier-following-chordmode.ly index 1815c55b76..b99142a0c0 100644 --- a/input/regression/identifier-following-chordmode.ly +++ b/input/regression/identifier-following-chordmode.ly @@ -7,10 +7,10 @@ modifier." } -\version "2.19.21" +\version "2.19.22" myDisplayMusic = -#(define-void-function (parser location music) +#(define-void-function (music) (ly:music?) (display-scheme-music music (current-error-port))) diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index cc59cbd152..fdf6da5ee2 100644 --- a/input/regression/lily-in-scheme.ly +++ b/input/regression/lily-in-scheme.ly @@ -12,20 +12,20 @@ the @code{TextScript} grob. } -\version "2.17.6" +\version "2.19.22" \layout { ragged-right = ##t } -withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?) +withPaddingA = #(define-music-function (padding music) (number? ly:music?) #{ \override TextScript.padding = #padding $music \revert TextScript.padding #}) -withPaddingB = #(define-music-function (parser location padding music) (number? ly:music?) +withPaddingB = #(define-music-function (padding music) (number? ly:music?) #{ \override TextScript.padding = #(* padding 2) $music \revert TextScript.padding #}) -withPaddingC = #(define-music-function (parser location padding music) (number? ly:music?) +withPaddingC = #(define-music-function (padding music) (number? ly:music?) #{ \override TextScript.padding = #(+ 1 (* padding 2)) $music \revert TextScript.padding #}) diff --git a/input/regression/loglevels.ly b/input/regression/loglevels.ly index 23ff272078..91b239a3e0 100644 --- a/input/regression/loglevels.ly +++ b/input/regression/loglevels.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" #(ly:set-option 'warning-as-error #f) #(ly:expect-warning (_ "Test warning\n")) @@ -15,8 +15,8 @@ are commented out. Comment them in to check the output manually. %%%% message functions of the Input class: #(display "\nMessage functions of the Input class:\n" (current-error-port)) -messageTest = #(define-music-function (parser location) () - (ly:input-message location "Test ly:input-message" ) +messageTest = #(define-music-function () () + (ly:input-message (*location*) "Test ly:input-message" ) (make-music 'Music)) { diff --git a/input/regression/magnifyStaff-bar-lines.ly b/input/regression/magnifyStaff-bar-lines.ly index 4bc357e817..c457b78a02 100644 --- a/input/regression/magnifyStaff-bar-lines.ly +++ b/input/regression/magnifyStaff-bar-lines.ly @@ -1,4 +1,4 @@ -\version "2.19.11" +\version "2.19.22" \header { texidoc = "Bar line thickness and spacing should be scaled along @@ -10,7 +10,7 @@ with notation size when using the @code{\magnifyStaff} command." } example = -#(define-music-function (parser location mag) (positive?) +#(define-music-function (mag) (positive?) #{ \new Staff \with { \magnifyStaff #mag diff --git a/input/regression/magnifyStaff-space-alist.ly b/input/regression/magnifyStaff-space-alist.ly index 561ac9e72a..731bea8e4e 100644 --- a/input/regression/magnifyStaff-space-alist.ly +++ b/input/regression/magnifyStaff-space-alist.ly @@ -1,4 +1,4 @@ -\version "2.19.11" +\version "2.19.22" \header { texidoc = "@code{space-alist} values should be scaled along @@ -13,7 +13,7 @@ with notation size when using the @code{\magnifyStaff} command." } example = -#(define-music-function (parser location mag) (positive?) +#(define-music-function (mag) (positive?) #{ \new Staff \with { \magnifyStaff #mag diff --git a/input/regression/make-relative-copies.ly b/input/regression/make-relative-copies.ly index 926de581b9..7f28075f9a 100644 --- a/input/regression/make-relative-copies.ly +++ b/input/regression/make-relative-copies.ly @@ -1,4 +1,4 @@ -\version "2.18.0" +\version "2.19.22" \header { texidoc = "@code{make-relative} has to copy its argument expressions @@ -14,7 +14,7 @@ identical." } reltranspose = -#(define-music-function (parser location from to music) +#(define-music-function (from to music) (ly:pitch? ly:pitch? ly:music?) (make-relative (music) music #{ \transpose #from #to $music #})) diff --git a/input/regression/make-relative-music.ly b/input/regression/make-relative-music.ly index 58266b2b35..ef8baf4ae1 100644 --- a/input/regression/make-relative-music.ly +++ b/input/regression/make-relative-music.ly @@ -1,4 +1,4 @@ -\version "2.19.0" +\version "2.19.22" \header { texidoc = "@code{make-relative} can make relativization on music @@ -10,7 +10,7 @@ expressions. This regtest defines an example function } withOctave = -#(define-music-function (parser location music) +#(define-music-function (music) (ly:music?) (make-relative (music) music diff --git a/input/regression/make-relative.ly b/input/regression/make-relative.ly index 0cf3ef1184..ee458b57a7 100644 --- a/input/regression/make-relative.ly +++ b/input/regression/make-relative.ly @@ -1,4 +1,4 @@ -\version "2.19.20" +\version "2.19.22" \header { texidoc = "@code{make-relative} is a Scheme utility macro mainly @@ -14,7 +14,7 @@ The fragment should appear identical in both cases." \layout { ragged-right= ##t } ph = -#(define-music-function (parser location p1 p2 p3 p4 p5) +#(define-music-function (p1 p2 p3 p4 p5) (ly:pitch? ly:pitch? ly:pitch? ly:pitch? ly:pitch?) (make-relative (p1 p2 p3 p4 p5) (make-event-chord (list p1 p2 p3 p4 p5)) #{ diff --git a/input/regression/markup-line-styles.ly b/input/regression/markup-line-styles.ly index 5cbf5edae4..ac15fa78ad 100644 --- a/input/regression/markup-line-styles.ly +++ b/input/regression/markup-line-styles.ly @@ -1,4 +1,4 @@ -\version "2.17.10" +\version "2.19.22" \header { texidoc = "The markup-commands @code{\\draw-dashed-line} and @@ -7,7 +7,7 @@ } test = -#(define-scheme-function (parser location x-nmbr y-nmbr)(number? number?) +#(define-scheme-function (x-nmbr y-nmbr)(number? number?) (let* ((lst (map (lambda (x) (let* ((x-lngth (if (positive? x-nmbr) diff --git a/input/regression/markup-rest-styles.ly b/input/regression/markup-rest-styles.ly index 5ed826230a..58bb24d3a0 100644 --- a/input/regression/markup-rest-styles.ly +++ b/input/regression/markup-rest-styles.ly @@ -1,4 +1,4 @@ -\version "2.17.9" +\version "2.19.22" \header { texidoc = "@code{\\rest-by-number} and @code{\\rest} support @@ -6,7 +6,7 @@ all rest styles." } showRestStyles = -#(define-scheme-function (parser location)() +#(define-scheme-function ()() (make-override-markup (cons 'baseline-skip 7) (make-column-markup diff --git a/input/regression/markup-rest.ly b/input/regression/markup-rest.ly index 3c4895df9d..4c05e960f7 100644 --- a/input/regression/markup-rest.ly +++ b/input/regression/markup-rest.ly @@ -1,4 +1,4 @@ -\version "2.17.19" +\version "2.19.22" \header { texidoc = "The rest markup function works for a variety of style, dot and @@ -6,7 +6,7 @@ duration settings." } showSimpleRest = -#(define-scheme-function (parser location dots) (string?) +#(define-scheme-function (dots) (string?) (make-override-markup (cons 'baseline-skip 7) (make-column-markup @@ -45,7 +45,7 @@ showSimpleRest = kievan))))) showMultiMeasureRests = -#(define-scheme-function (parser location)() +#(define-scheme-function ()() (make-override-markup (cons 'baseline-skip 7) (make-column-markup diff --git a/input/regression/music-function-post-event.ly b/input/regression/music-function-post-event.ly index c6421c38c2..dd3548a779 100644 --- a/input/regression/music-function-post-event.ly +++ b/input/regression/music-function-post-event.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header { @@ -12,7 +12,7 @@ of the resulting object is set accordingly." } dynScript = -#(define-music-function (parser location text) (string?) +#(define-music-function (text) (string?) (make-dynamic-script text)) \relative { diff --git a/input/regression/music-function-string-markup.ly b/input/regression/music-function-string-markup.ly index 7c584e0f23..3734dae696 100644 --- a/input/regression/music-function-string-markup.ly +++ b/input/regression/music-function-string-markup.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" \header { texidoc = "Music functions accept strings as markup arguments @@ -7,7 +7,7 @@ when using the type predicate @code{markup?} } testFunc = -#(define-music-function (parser location text music) (markup? ly:music?) +#(define-music-function (text music) (markup? ly:music?) ;; dummy function, does nothing music) diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index 8f4da124fa..c571b2f3ab 100644 --- a/input/regression/music-function.ly +++ b/input/regression/music-function.ly @@ -7,9 +7,9 @@ demonstrate a @code{\\myBar} function, which works similar to @code{\\bar}, but is implemented completely in Scheme." } -\version "2.17.5" +\version "2.19.22" -myBar = #(define-music-function (parser location bar-type) (string?) +myBar = #(define-music-function (bar-type) (string?) (context-spec-music (context-spec-music (make-property-set 'whichBar bar-type) 'Timing) 'Score)) diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 987b312feb..c0833981e4 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.22" \header{ texidoc=" Note head shapes may be set from several choices. @@ -17,7 +17,7 @@ dimensions. } pattern = -#(define-music-function (parser location name style) (markup? ly:context-mod?) +#(define-music-function (name style) (markup? ly:context-mod?) #{ << s1^#name \new Voice \with #style { @@ -31,7 +31,7 @@ pattern = >> #}) patternStyle = -#(define-music-function (parser location style) (symbol?) +#(define-music-function (style) (symbol?) #{ \pattern #(symbol->string style) \with { \override NoteHead.style = #style diff --git a/input/regression/optional-args-backup.ly b/input/regression/optional-args-backup.ly index e48cc28d24..63650fdec2 100644 --- a/input/regression/optional-args-backup.ly +++ b/input/regression/optional-args-backup.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" \header{ texidoc= "Test backup of predicate-based optional music function arguments. @@ -16,12 +16,12 @@ separate arguments." \layout { ragged-right = ##t } -test=#(define-void-function (parser location expect . rest) +test=#(define-void-function (expect . rest) (list? (string? "def1") (integer? "def2") (fraction? "def3") integer?) (if (not (equal? expect rest)) - (ly:parser-error parser + (ly:parser-error (*parser*) (format #f "Expected ~s, got ~s.\n" expect rest) - location))) + (*location*)))) twice=2 diff --git a/input/regression/optional-args-predicate.ly b/input/regression/optional-args-predicate.ly index d50230f594..c8b4668ca1 100644 --- a/input/regression/optional-args-predicate.ly +++ b/input/regression/optional-args-predicate.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" \header{ texidoc= "Test predicate-based optional music function argument skipping." @@ -6,13 +6,13 @@ \layout { ragged-right = ##t } -test=#(define-scheme-function (parser location str int frac exp) +test=#(define-scheme-function (str int frac exp) ((string? "def1") (integer? "def2") (number-pair? "def3") list?) (if (not (equal? (list str int frac) exp)) - (ly:parser-error parser + (ly:parser-error (*parser*) (format #f "Expected ~a, got ~a.\n" exp (list str int frac)) - location))) + (*location*)))) \test "a" #3 #'(3 . 4) #'("a" 3 (3 . 4)) \test "a" #3 #'("a" 3 "def3") diff --git a/input/regression/optional-args.ly b/input/regression/optional-args.ly index 5086bf0dba..8277ce28c0 100644 --- a/input/regression/optional-args.ly +++ b/input/regression/optional-args.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" \header{ texidoc= "Test optional music function arguments. @@ -13,13 +13,13 @@ the rest is skipped." % Just like \relative, but defaulting to f as reference, making the % first note of the music the same as if written as absolute pitch ablative = -#(define-music-function (parser location ref music) +#(define-music-function (ref music) ((ly:pitch? #{ f #}) ly:music?) #{ \relative $ref $music #}) % Let's take a duration and four pitches, defaulting to 2 c' d' e' zap = -#(define-music-function (parser location dur a b c d) +#(define-music-function (dur a b c d) ((ly:duration? #{ 2 #}) (ly:pitch? #{ c' #}) (ly:pitch? #{ d' #}) (ly:pitch? #{ e' #}) ly:music?) #{ $a $dur $b $c ^\markup{!} $d #}) diff --git a/input/regression/phrasing-slur-multiple.ly b/input/regression/phrasing-slur-multiple.ly index 14d163b4cc..08487af5d9 100644 --- a/input/regression/phrasing-slur-multiple.ly +++ b/input/regression/phrasing-slur-multiple.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" #(ly:set-option 'warning-as-error #f) #(ly:expect-warning (_ "already have phrasing slur")) @@ -12,7 +12,7 @@ slur will not be generated. However, one can can create a second slur with a different spanner-id." } -sp=#(define-event-function (parser location n e) (index? ly:event?) +sp=#(define-event-function (n e) (index? ly:event?) (set! (ly:music-property e 'spanner-id) (format "sp~a" n)) e) diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index f06bda4a7e..b68095c5da 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.22" \header { texidoc = "Breve, whole and half rests moving outside the staff should get ledger lines." @@ -8,7 +8,7 @@ ledger lines." \paper { ragged-right = ##t } rPos = -#(define-music-function (parser location y) (number?) +#(define-music-function (y) (number?) #{ \override Rest.staff-position = #y #}) { diff --git a/input/regression/scheme-book-scores.ly b/input/regression/scheme-book-scores.ly index fd1609f1b6..cdc2c7fcdc 100644 --- a/input/regression/scheme-book-scores.ly +++ b/input/regression/scheme-book-scores.ly @@ -1,4 +1,4 @@ -\version "2.17.11" +\version "2.19.22" \header { @@ -31,8 +31,8 @@ informations from top- and booklevel stack correctly." (set! pitch (modulo (1+ pitch) 7))))) oneNoteScore = -#(define-void-function (parser location) () - (add-one-note-score parser)) +#(define-void-function () () + (add-one-note-score (*parser*))) %%% diff --git a/input/regression/slur-multiple.ly b/input/regression/slur-multiple.ly index 9662494bb1..a5e8b38c60 100644 --- a/input/regression/slur-multiple.ly +++ b/input/regression/slur-multiple.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.22" #(ly:set-option 'warning-as-error #f) #(ly:expect-warning (_ "already have slur")) @@ -12,7 +12,7 @@ slur will not be generated. However, one can can create a second slur with a different spanner-id." } -sp=#(define-event-function (parser location n e) (index? ly:event?) +sp=#(define-event-function (n e) (index? ly:event?) (set! (ly:music-property e 'spanner-id) (format "sp~a" n)) e) diff --git a/input/regression/tag-group.ly b/input/regression/tag-group.ly index 76b0a3fb64..d12e5f6575 100644 --- a/input/regression/tag-group.ly +++ b/input/regression/tag-group.ly @@ -1,4 +1,4 @@ -\version "2.19.14" +\version "2.19.22" \header { texidoc = "The operation of @code{\\keepWithTag} can be made more @@ -28,7 +28,7 @@ music = >> demo = -#(define-music-function (parser location syms m) +#(define-music-function (syms m) (symbol-list? ly:music?) #{ \new Score << @@ -40,7 +40,7 @@ demo = #(set-global-staff-size 16) demoline = -#(define-scheme-function (parser location m1 m2) (ly:music? ly:music?) +#(define-scheme-function (m1 m2) (ly:music? ly:music?) #{ \markup \column { \fill-line { \null \score { #m1 } \score { #m2 } \null } \vspace #1 } diff --git a/input/regression/tag-multiple.ly b/input/regression/tag-multiple.ly index 2f581e12ad..157c0aff38 100644 --- a/input/regression/tag-multiple.ly +++ b/input/regression/tag-multiple.ly @@ -1,4 +1,4 @@ -\version "2.19.2" +\version "2.19.22" \header { texidoc = "The @code{\\removeWithTag} and @code{\\keepWithTag} @@ -16,7 +16,7 @@ music = >> demo = -#(define-music-function (parser location fun syms m) +#(define-music-function (fun syms m) (ly:music-function? symbol-list? ly:music?) #{ \new Staff diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 1b9819e7ae..f867e54613 100644 --- a/input/regression/tie-chord.ly +++ b/input/regression/tie-chord.ly @@ -11,7 +11,7 @@ each system." } -\version "2.19.21" +\version "2.19.22" \paper { indent = #0.0 @@ -21,7 +21,7 @@ each system." generateTiePattern -= #(define-music-function (parser location is-long chords) (boolean? ly:music?) += #(define-music-function (is-long chords) (boolean? ly:music?) " diff --git a/ly/articulate.ly b/ly/articulate.ly index ecfa8f38a7..5b7ab7234f 100644 --- a/ly/articulate.ly +++ b/ly/articulate.ly @@ -119,7 +119,7 @@ % * Add Mordents (reported by Patrick Karl) % -\version "2.17.11" +\version "2.19.22" #(use-modules (srfi srfi-1)) #(use-modules (srfi srfi-11)) @@ -866,7 +866,7 @@ % At last ... here's the music function that applies all the above to a % score. -articulate = #(define-music-function (parser location music) +articulate = #(define-music-function (music) (ly:music?) "Adjust times of note to add tenuto, staccato and normal articulations. @@ -878,7 +878,7 @@ articulate = #(define-music-function (parser location music) (lambda () (music-map ac:articulate-chord - (ac:unfoldMusic (event-chord-wrap! music parser)))) + (ac:unfoldMusic (event-chord-wrap! music (*parser*))))) (lambda () (or (= ac:stealForward 0) (begin @@ -891,11 +891,11 @@ articulate = #(define-music-function (parser location music) % Special handling for a gruppetto after a trill. afterGrace = #(define-music-function - (parser location main grace) + (main grace) (ly:music? ly:music?) - (set! main (event-chord-wrap! main parser)) - (set! grace (event-chord-wrap! grace parser)) + (set! main (event-chord-wrap! main (*parser*))) + (set! grace (event-chord-wrap! grace (*parser*))) (let* ((main-length (ly:music-length main)) (grace-orig-length (ly:music-length grace)) @@ -918,10 +918,10 @@ afterGrace = % Somewhere around the end of the 19th, start of 20th century the rules % changed, but my main interest is early music. appoggiatura = -#(define-music-function (parser location grace main) +#(define-music-function (grace main) (ly:music? ly:music?) - (set! grace (event-chord-wrap! grace parser)) - (set! main (event-chord-wrap! main parser)) + (set! grace (event-chord-wrap! grace (*parser*))) + (set! main (event-chord-wrap! main (*parser*))) (let* ((maindur (ly:music-length main)) (grace-orig-len (ly:music-length grace)) (main-orig-len (ly:music-length main)) diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly index 6fc039e4a0..1c239246a0 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.19.16" +\version "2.19.22" % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. % Flat notes used mainly in some modern music. @@ -92,10 +92,10 @@ marchTime = { } % Add appropriate tweaks needed for piping grace notes to look great. -stemspace = #(define-music-function (parser location extent) (pair?) #{ +stemspace = #(define-music-function (extent) (pair?) #{ \once \override Staff.Stem.X-extent = #extent #}) -pgrace = #(define-music-function (parser location notes) (ly:music?) #{ +pgrace = #(define-music-function (notes) (ly:music?) #{ \override Score.GraceSpacing.spacing-increment = #0 \override Score.Stem.beamlet-max-length-proportion = #'(0.5 . 0.5) \small \grace $notes \normalsize diff --git a/ly/chord-repetition-init.ly b/ly/chord-repetition-init.ly index 70d7b6c26d..72c561a7e6 100644 --- a/ly/chord-repetition-init.ly +++ b/ly/chord-repetition-init.ly @@ -1,5 +1,5 @@ %%% -*- Mode: Scheme -*- -\version "2.16.0" +\version "2.19.22" %{ Chord repetition behavior is not customizable in the parser. That is due to it usually being done by the toplevel music handler @@ -15,7 +15,7 @@ %} chordRepeats = -#(define-music-function (parser location event-types music) +#(define-music-function (event-types music) ((list? '()) ly:music?) "Walk through @var{music} putting the notes of the previous chord into repeat chords, as well as an optional list of @var{event-types} @@ -23,7 +23,7 @@ such as @code{#'(string-number-event)}." (expand-repeat-chords! (cons 'rhythmic-event event-types) music)) tabChordRepeats = -#(define-music-function (parser location event-types music) +#(define-music-function (event-types music) ((list? '()) ly:music?) "Walk through @var{music} putting the notes, fingerings and string numbers of the previous chord into repeat chords, as well as an @@ -34,8 +34,8 @@ optional list of @var{event-types} such as @code{#'(articulation-event)}." #}) tabChordRepetition = -#(define-void-function (parser location) () +#(define-void-function () () (_i "Include the string and fingering information in a chord repetition. This function is deprecated; try using @code{\\tabChordRepeats} instead.") - (ly:parser-define! parser '$chord-repeat-events + (ly:parser-define! (*parser*) '$chord-repeat-events '(string-number-event fingering-event))) diff --git a/ly/festival.ly b/ly/festival.ly index 8363525e9a..ad3541ce98 100644 --- a/ly/festival.ly +++ b/ly/festival.ly @@ -17,21 +17,21 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>. -\version "2.16.0" +\version "2.19.22" #(use-modules (scm song)) #(use-modules (srfi srfi-39)) % \festival #"filename" { \tempo N = X } { music } festival = -#(define-music-function (parser location filename tempo music) +#(define-music-function (filename tempo music) (string? ly:music? ly:music?) (output-file music tempo filename) music) % \festivalsyl #"filename" { \tempo N = X } { music } festivalsyl = -#(define-music-function (parser location filename tempo music) +#(define-music-function (filename tempo music) (string? ly:music? ly:music?) (parameterize ((*syllabify* #t)) (output-file music tempo filename)) diff --git a/ly/gregorian.ly b/ly/gregorian.ly index ca2b270331..e4d34f6e4c 100644 --- a/ly/gregorian.ly +++ b/ly/gregorian.ly @@ -3,7 +3,7 @@ $Id$ %} -\version "2.17.30" +\version "2.19.22" % % Declare memorable shortcuts for special unicode characters @@ -37,12 +37,12 @@ iij = \lyricmode { iij } % Add unicode 2123 (versicle) as prefix to lyrics. versus = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (add-prefix-to-lyrics "℣" music)) % Add unicode 211F (response) as prefix to lyrics. responsum = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (add-prefix-to-lyrics "℟" music)) % @@ -151,7 +151,7 @@ circulus = #(make-articulation "circulus") % it is applied by one. % augmentum = -#(define-music-function (parser location expr) (ly:music?) +#(define-music-function (expr) (ly:music?) (shift-duration-log expr 0 1)) % diff --git a/ly/lyrics-tkit.ly b/ly/lyrics-tkit.ly index 91a19cd884..0f6a0a7feb 100644 --- a/ly/lyrics-tkit.ly +++ b/ly/lyrics-tkit.ly @@ -1,4 +1,4 @@ -%\version "2.19.19" +%\version "2.19.22" %%% The function used by the built-in templates to % build a lyrics context and associate it with a voice. @@ -7,7 +7,7 @@ make-one-stanza = #(define-music-function - (parser location pos staffPrefix voicePrefix altVoicePrefix lyrics) + (pos staffPrefix voicePrefix altVoicePrefix lyrics) ((above-or-below? #f) voice-prefix? voice-prefix? diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index faec592e81..78b930d462 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -18,7 +18,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>. -\version "2.17.11" +\version "2.19.22" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -32,7 +32,7 @@ %% TODO: using define-music-function in a .scm causes crash. absolute = -#(define-music-function (parser location music) +#(define-music-function (music) (ly:music?) (_i "Make @var{music} absolute. This does not actually change the music itself but rather hides it from surrounding @code{\\relative} @@ -47,23 +47,23 @@ acciaccatura = instrument-definitions = #'() addInstrumentDefinition = #(define-void-function - (parser location name lst) (string? list?) + (name lst) (string? list?) (_i "Create instrument @var{name} with properties @var{list}.") (set! instrument-definitions (acons name lst instrument-definitions))) addQuote = -#(define-void-function (parser location name music) (string? ly:music?) +#(define-void-function (name music) (string? ly:music?) (_i "Define @var{music} as a quotable music expression named @var{name}") - (add-quotable parser name music)) + (add-quotable (*parser*) name music)) %% keep these two together afterGraceFraction = #(cons 6 8) afterGrace = -#(define-music-function (parser location main grace) (ly:music? ly:music?) +#(define-music-function (main grace) (ly:music? ly:music?) (_i "Create @var{grace} note(s) after a @var{main} music expression.") (let ((main-length (ly:music-length main)) - (fraction (ly:parser-lookup parser 'afterGraceFraction))) + (fraction (ly:parser-lookup (*parser*) 'afterGraceFraction))) (make-simultaneous-music (list main @@ -84,7 +84,7 @@ afterGrace = %% music identifiers not allowed at top-level, %% so this is a music-function instead. allowPageTurn = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Allow a page turn. May be used at toplevel (ie between scores or markups), or inside a score.") (make-music 'EventChord @@ -94,7 +94,7 @@ markups), or inside a score.") 'break-permission 'allow)))) alterBroken = -#(define-music-function (parser location property arg item) +#(define-music-function (property arg item) (symbol-list-or-symbol? list? symbol-list-or-music?) (_i "Override @var{property} for pieces of broken spanner @var{item} with values @var{arg}. @var{item} may either be music in the form of @@ -108,7 +108,7 @@ form of a spanner event, @var{property} may also have the form (begin (ly:music-warning item (_ "not a spanner")) item)) - (let* ((p (check-grob-path item parser location + (let* ((p (check-grob-path item (*parser*) (*location*) #:default 'Bottom #:min 2 #:max 2)) @@ -124,11 +124,11 @@ form of a spanner event, @var{property} may also have the form #(value-for-spanner-piece arg) #} (begin - (ly:input-warning location (_ "not a spanner name, `~a'") name) + (ly:input-warning (*location*) (_ "not a spanner name, `~a'") name) (make-music 'Music)))))) appendToTag = -#(define-music-function (parser location tag more music) +#(define-music-function (tag more music) (symbol? ly:music? ly:music?) (_i "Append @var{more} to the @code{elements} of all music expressions in @var{music} that are tagged with @var{tag}.") @@ -141,18 +141,18 @@ expressions in @var{music} that are tagged with @var{tag}.") music)) applyContext = -#(define-music-function (parser location proc) (procedure?) +#(define-music-function (proc) (procedure?) (_i "Modify context properties with Scheme procedure @var{proc}.") (make-music 'ApplyContext 'procedure proc)) applyMusic = -#(define-music-function (parser location func music) (procedure? ly:music?) +#(define-music-function (func music) (procedure? ly:music?) (_i"Apply procedure @var{func} to @var{music}.") (func music)) applyOutput = -#(define-music-function (parser location ctx proc) (symbol? procedure?) +#(define-music-function (ctx proc) (symbol? procedure?) (_i "Apply function @code{proc} to every layout object in context @code{ctx}") (make-music 'ApplyOutputEvent 'procedure proc @@ -164,25 +164,25 @@ appoggiatura = % for regression testing purposes. assertBeamQuant = -#(define-music-function (parser location l r) (pair? pair?) +#(define-music-function (l r) (pair? pair?) (_i "Testing function: check whether the beam quants @var{l} and @var{r} are correct") (make-grob-property-override 'Beam 'positions (check-quant-callbacks l r))) % for regression testing purposes. assertBeamSlope = -#(define-music-function (parser location comp) (procedure?) +#(define-music-function (comp) (procedure?) (_i "Testing function: check whether the slope of the beam is the same as @code{comp}") (make-grob-property-override 'Beam 'positions (check-slope-callbacks comp))) autochange = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Make voices that switch between staves automatically") - (make-autochange-music parser music)) + (make-autochange-music (*parser*) music)) balloonGrobText = -#(define-music-function (parser location grob-name offset text) +#(define-music-function (grob-name offset text) (symbol? number-pair? markup?) (_i "Attach @var{text} to @var{grob-name} at offset @var{offset} (use like @code{\\once})") @@ -195,7 +195,7 @@ balloonGrobText = 'text text)))) balloonText = -#(define-event-function (parser location offset text) (number-pair? markup?) +#(define-event-function (offset text) (number-pair? markup?) (_i "Attach @var{text} at @var{offset} (use like @code{\\tweak})") (make-music 'AnnotateOutputEvent 'X-offset (car offset) @@ -203,26 +203,26 @@ balloonText = 'text text)) bar = -#(define-music-function (parser location type) (string?) +#(define-music-function (type) (string?) (_i "Insert a bar line of type @var{type}") (context-spec-music (make-property-set 'whichBar type) 'Timing)) barNumberCheck = -#(define-music-function (parser location n) (integer?) +#(define-music-function (n) (integer?) (_i "Print a warning if the current bar number is not @var{n}.") (make-music 'ApplyContext 'procedure (lambda (c) (let ((cbn (ly:context-property c 'currentBarNumber))) (if (and (number? cbn) (not (= cbn n))) - (ly:input-warning location + (ly:input-warning (*location*) "Barcheck failed got ~a expect ~a" cbn n)))))) beamExceptions = -#(define-scheme-function (parser location music) (ly:music?) +#(define-scheme-function (music) (ly:music?) (_i "Extract a value suitable for setting @code{Timing.beamExceptions} from the given pattern with explicit beams in @var{music}. A bar check @code{|} has to be used between @@ -230,39 +230,39 @@ bars of patterns in order to reset the timing.") (extract-beam-exceptions music)) bendAfter = -#(define-event-function (parser location delta) (real?) +#(define-event-function (delta) (real?) (_i "Create a fall or doit of pitch interval @var{delta}.") (make-music 'BendAfterEvent 'delta-step delta)) bookOutputName = -#(define-void-function (parser location newfilename) (string?) +#(define-void-function (newfilename) (string?) (_i "Direct output for the current book block to @var{newfilename}.") - (set! (paper-variable parser #f 'output-filename) newfilename)) + (set! (paper-variable (*parser*) #f 'output-filename) newfilename)) bookOutputSuffix = -#(define-void-function (parser location newsuffix) (string?) +#(define-void-function (newsuffix) (string?) (_i "Set the output filename suffix for the current book block to @var{newsuffix}.") - (set! (paper-variable parser #f 'output-suffix) newsuffix)) + (set! (paper-variable (*parser*) #f 'output-suffix) newsuffix)) %% \breathe is defined as a music function rather than an event identifier to %% ensure it gets useful input location information: as an event identifier, %% it would have to be wrapped in an EventChord to prevent it from being %% treated as a post_event by the parser breathe = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Insert a breath mark.") (make-music 'BreathingEvent)) clef = -#(define-music-function (parser location type) (string?) +#(define-music-function (type) (string?) (_i "Set the current clef to @var{type}.") (make-clef-set type)) compoundMeter = -#(define-music-function (parser location args) (pair?) +#(define-music-function (args) (pair?) (_i "Create compound time signatures. The argument is a Scheme list of lists. Each list describes one fraction, with the last entry being the denominator, while the first entries describe the summands in the @@ -288,7 +288,7 @@ as @code{\\compoundMeter #'((3 2 8))} or shorter #} )) compressMMRests = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Remove the empty bars created by multi-measure rests, leaving just the first bar containing the MM rest itself.") (music-map @@ -299,7 +299,7 @@ leaving just the first bar containing the MM rest itself.") music)) crossStaff = -#(define-music-function (parser location notes) (ly:music?) +#(define-music-function (notes) (ly:music?) (_i "Create cross-staff stems") #{ \temporary \override Stem.cross-staff = #cross-staff-connect @@ -310,18 +310,18 @@ crossStaff = #}) cueClef = -#(define-music-function (parser location type) (string?) +#(define-music-function (type) (string?) (_i "Set the current cue clef to @var{type}.") (make-cue-clef-set type)) cueClefUnset = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Unset the current cue clef.") (make-cue-clef-unset)) cueDuring = #(define-music-function - (parser location what dir main-music) (string? ly:dir? ly:music?) + (what dir main-music) (string? ly:dir? ly:music?) (_i "Insert contents of quote @var{what} corresponding to @var{main-music}, in a CueVoice oriented by @var{dir}.") (make-music 'QuoteMusic @@ -333,7 +333,7 @@ in a CueVoice oriented by @var{dir}.") cueDuringWithClef = #(define-music-function - (parser location what dir clef main-music) (string? ly:dir? string? ly:music?) + (what dir clef main-music) (string? ly:dir? string? ly:music?) (_i "Insert contents of quote @var{what} corresponding to @var{main-music}, in a CueVoice oriented by @var{dir}.") (make-music 'QuoteMusic @@ -347,16 +347,16 @@ in a CueVoice oriented by @var{dir}.") displayLilyMusic = -#(define-music-function (parser location port music) ((output-port?) ly:music?) +#(define-music-function (port music) ((output-port?) ly:music?) (_i "Display the LilyPond input representation of @var{music} to @var{port}, defaulting to the console.") (let ((port (or port (current-output-port)))) (newline port) - (display-lily-music music parser port)) + (display-lily-music music (*parser*) port)) music) displayMusic = -#(define-music-function (parser location port music) ((output-port?) ly:music?) +#(define-music-function (port music) ((output-port?) ly:music?) (_i "Display the internal representation of @var{music} to @var{port}, default to the console.") (let ((port (or port (current-output-port)))) @@ -365,7 +365,7 @@ displayMusic = music) displayScheme = -#(define-scheme-function (parser location port expr) ((output-port?) scheme?) +#(define-scheme-function (port expr) ((output-port?) scheme?) (_i "Display the internal representation of @var{expr} to @var{port}, default to the console.") (let ((port (or port (current-output-port)))) @@ -376,7 +376,7 @@ displayScheme = endSpanners = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Terminate the next spanner prematurely after exactly one note without the need of a specific end spanner.") (let* ((start-span-evs (filter (lambda (ev) @@ -395,14 +395,14 @@ without the need of a specific end spanner.") total)) eventChords = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Compatibility function wrapping @code{EventChord} around isolated rhythmic events occuring since version 2.15.28, after expanding repeat chords @samp{q}.") - (event-chord-wrap! music parser)) + (event-chord-wrap! music (*parser*))) featherDurations= -#(define-music-function (parser location factor argument) (ly:moment? ly:music?) +#(define-music-function (factor argument) (ly:moment? ly:music?) (_i "Adjust durations of music in @var{argument} by rational @var{factor}.") (let ((orig-duration (ly:music-length argument)) (multiplier (ly:make-moment 1 1))) @@ -421,7 +421,7 @@ featherDurations= argument)) finger = -#(define-event-function (parser location finger) (number-or-markup?) +#(define-event-function (finger) (number-or-markup?) (_i "Apply @var{finger} as a fingering indication.") (make-music @@ -430,7 +430,7 @@ finger = finger)) fixed = -#(define-music-function (parser location pitch music) +#(define-music-function (pitch music) (ly:pitch? ly:music?) (_i "Use the octave of @var{pitch} as the default octave for @var{music}.") (let ((octave-marks (1+ (ly:pitch-octave pitch)))) @@ -444,7 +444,7 @@ fixed = (make-music 'RelativeOctaveMusic 'element music)) footnote = -#(define-music-function (parser location mark offset footnote item) +#(define-music-function (mark offset footnote item) ((markup?) number-pair? markup? symbol-list-or-music?) (_i "Make the markup @var{footnote} a footnote on @var{item}. The footnote is marked with a markup @var{mark} moved by @var{offset} with @@ -479,7 +479,7 @@ grace = (_i "Insert @var{music} as grace notes.")) grobdescriptions = -#(define-scheme-function (parser location descriptions) (list?) +#(define-scheme-function (descriptions) (list?) (_i "Create a context modification from @var{descriptions}, a list in the format of @code{all-grob-descriptions}.") (ly:make-context-mod @@ -487,7 +487,7 @@ in the format of @code{all-grob-descriptions}.") (list 'assign (car p) (ly:make-grob-properties (cdr p)))) descriptions))) -harmonicByFret = #(define-music-function (parser location fret music) (number? ly:music?) +harmonicByFret = #(define-music-function (fret music) (number? ly:music?) (_i "Convert @var{music} into mixed harmonics; the resulting notes resemble harmonics played on a fretted instrument by touching the strings at @var{fret}.") #{ @@ -504,7 +504,7 @@ harmonics played on a fretted instrument by touching the strings at @var{fret}." \revert NoteHead.stencil #}) -harmonicByRatio = #(define-music-function (parser location ratio music) (number? ly:music?) +harmonicByRatio = #(define-music-function (ratio music) (number? ly:music?) (_i "Convert @var{music} into mixed harmonics; the resulting notes resemble harmonics played on a fretted instrument by touching the strings at the point given through @var{ratio}.") @@ -523,7 +523,7 @@ given through @var{ratio}.") #}) hide = -#(define-music-function (parser location item) (symbol-list-or-music?) +#(define-music-function (item) (symbol-list-or-music?) (_i "Set @var{item}'s @samp{transparent} property to @code{#t}, making it invisible while still retaining its dimensions. @@ -534,7 +534,7 @@ the same music expression with an appropriate tweak applied to it.") #{ \tweak transparent ##t #item #}) inStaffSegno = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Put the segno variant 'varsegno' at this position into the staff, compatible with the repeat command.") (make-music 'ApplyContext @@ -548,14 +548,14 @@ compatible with the repeat command.") instrumentSwitch = #(define-music-function - (parser location name) (string?) + (name) (string?) (_i "Switch instrument to @var{name}, which must be predefined with @code{\\addInstrumentDefinition}.") (let* ((handle (assoc name instrument-definitions)) (instrument-def (if handle (cdr handle) '()))) (if (not handle) - (ly:input-warning location "No such instrument: ~a" name)) + (ly:input-warning (*location*) "No such instrument: ~a" name)) (context-spec-music (make-music 'SimultaneousMusic 'elements @@ -569,7 +569,7 @@ instrumentSwitch = keepWithTag = -#(define-music-function (parser location tags music) +#(define-music-function (tags music) (symbol-list-or-symbol? ly:music?) (_i "Include only elements of @var{music} that are tagged with one of the tags in @var{tags}. @var{tags} may be either a single symbol @@ -584,14 +584,14 @@ retained.") music)) key = -#(define-music-function (parser location tonic pitch-alist) +#(define-music-function (tonic pitch-alist) ((ly:pitch? '()) (list? '())) (_i "Set key to @var{tonic} and scale @var{pitch-alist}. If both are null, just generate @code{KeyChangeEvent}.") (cond ((null? tonic) (make-music 'KeyChangeEvent)) ((null? pitch-alist) - (ly:parser-error parser (_ "second argument must be pitch list") - location) + (ly:parser-error (*parser*) (_ "second argument must be pitch list") + (*location*)) (make-music 'SequentialMusic 'void #t)) (else (ly:music-transpose @@ -601,7 +601,7 @@ If both are null, just generate @code{KeyChangeEvent}.") tonic)))) killCues = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Remove cue notes from @var{music}.") (music-map (lambda (mus) @@ -614,7 +614,7 @@ killCues = label = -#(define-music-function (parser location label) (symbol?) +#(define-music-function (label) (symbol?) (_i "Create @var{label} as a bookmarking label.") (make-music 'EventChord 'page-marker #t @@ -624,28 +624,28 @@ label = language = -#(define-void-function (parser location language) (string?) +#(define-void-function (language) (string?) (_i "Set note names for language @var{language}.") - (note-names-language parser language)) + (note-names-language (*parser*) language)) languageSaveAndChange = -#(define-void-function (parser location language) (string?) +#(define-void-function (language) (string?) (_i "Store the previous pitchnames alist, and set a new one.") (set! previous-pitchnames pitchnames) - (note-names-language parser language)) + (note-names-language (*parser*) language)) languageRestore = -#(define-void-function (parser location) () +#(define-void-function () () (_i "Restore a previously-saved pitchnames alist.") (if previous-pitchnames (begin (set! pitchnames previous-pitchnames) - (ly:parser-set-note-names parser pitchnames)) - (ly:input-warning location (_ "No other language was defined previously. Ignoring.")))) + (ly:parser-set-note-names (*parser*) pitchnames)) + (ly:input-warning (*location*) (_ "No other language was defined previously. Ignoring.")))) magnifyMusic = -#(define-music-function (parser location mag music) (positive? ly:music?) +#(define-music-function (mag music) (positive? ly:music?) (_i "Magnify the notation of @var{music} without changing the staff-size, using @var{mag} as a size factor. Stems, beams, slurs, ties, and horizontal spacing are adjusted automatically.") @@ -719,7 +719,7 @@ slurs, ties, and horizontal spacing are adjusted automatically.") #}) magnifyStaff = -#(define-music-function (parser location mag) (positive?) +#(define-music-function (mag) (positive?) (_i "Change the size of the staff, adjusting notation size and horizontal spacing automatically, using @var{mag} as a size factor.") @@ -777,12 +777,12 @@ horizontal spacing automatically, using @var{mag} as a size factor.") #}) makeClusters = -#(define-music-function (parser location arg) (ly:music?) +#(define-music-function (arg) (ly:music?) (_i "Display chords in @var{arg} as clusters.") (music-map note-to-cluster arg)) modalInversion = -#(define-music-function (parser location around to scale music) +#(define-music-function (around to scale music) (ly:pitch? ly:pitch? ly:music? ly:music?) (_i "Invert @var{music} about @var{around} using @var{scale} and transpose from @var{around} to @var{to}.") @@ -791,7 +791,7 @@ transpose from @var{around} to @var{to}.") music)) modalTranspose = -#(define-music-function (parser location from to scale music) +#(define-music-function (from to scale music) (ly:pitch? ly:pitch? ly:music? ly:music?) (_i "Transpose @var{music} from pitch @var{from} to pitch @var{to} using @var{scale}.") @@ -801,20 +801,20 @@ using @var{scale}.") inversion = #(define-music-function - (parser location around to music) (ly:pitch? ly:pitch? ly:music?) + (around to music) (ly:pitch? ly:pitch? ly:music?) (_i "Invert @var{music} about @var{around} and transpose from @var{around} to @var{to}.") (music-invert around to music)) mark = #(define-music-function - (parser location label) ((scheme? '())) + (label) ((scheme? '())) "Make the music for the \\mark command." (let* ((set (and (integer? label) (context-spec-music (make-property-set 'rehearsalMark label) 'Score))) (ev (make-music 'MarkEvent - 'origin location))) + 'origin (*location*)))) (if set (make-sequential-music (list set ev)) @@ -823,14 +823,14 @@ mark = ev)))) musicMap = -#(define-music-function (parser location proc mus) (procedure? ly:music?) +#(define-music-function (proc mus) (procedure? ly:music?) (_i "Apply @var{proc} to @var{mus} and all of the music it contains.") (music-map proc mus)) %% noPageBreak and noPageTurn are music functions (not music indentifiers), %% because music identifiers are not allowed at top-level. noPageBreak = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Forbid a page break. May be used at toplevel (i.e., between scores or markups), or inside a score.") (make-music 'EventChord @@ -840,7 +840,7 @@ markups), or inside a score.") 'break-permission '())))) noPageTurn = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Forbid a page turn. May be used at toplevel (i.e., between scores or markups), or inside a score.") (make-music 'EventChord @@ -852,13 +852,13 @@ markups), or inside a score.") octaveCheck = -#(define-music-function (parser location pitch) (ly:pitch?) +#(define-music-function (pitch) (ly:pitch?) (_i "Octave check.") (make-music 'RelativeOctaveCheck 'pitch pitch)) offset = -#(define-music-function (parser location property offsets item) +#(define-music-function (property offsets item) (symbol-list-or-symbol? scheme? symbol-list-or-music?) (_i "Offset the default value of @var{property} of @var{item} by @var{offsets}. If @var{item} is a string, the result is @@ -871,7 +871,7 @@ appropriate tweak applied.") (if (symbol? property) (list property) property) - parser location + (*parser*) (*location*) #:start 1 #:default #t #:min 2 #:max 2))) (if prop-path ; If the head of the grob property path is a symbol--i.e., @@ -891,7 +891,7 @@ appropriate tweak applied.") (if (symbol? property) (list property) property)) - parser location + (*parser*) (*location*) #:default 'Bottom #:min 3 #:max 3))) (if prop-path #{ @@ -900,7 +900,7 @@ appropriate tweak applied.") (make-music 'Music))))) omit = -#(define-music-function (parser location item) (symbol-list-or-music?) +#(define-music-function (item) (symbol-list-or-music?) (_i "Set @var{item}'s @samp{stencil} property to @code{#f}, effectively omitting it without taking up space. @@ -911,7 +911,7 @@ the same music expression with an appropriate tweak applied to it.") #{ \tweak stencil ##f #item #}) once = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Set @code{once} to @code{#t} on all layout instruction events in @var{music}. This will complain about music with an actual duration. As a special exception, if @var{music} contains @@ -932,14 +932,14 @@ tweak.") music) ottava = -#(define-music-function (parser location octave) (integer?) +#(define-music-function (octave) (integer?) (_i "Set the octavation.") (make-music 'OttavaMusic 'ottava-number octave)) overrideTimeSignatureSettings = #(define-music-function - (parser location time-signature base-moment beat-structure beam-exceptions) + (time-signature base-moment beat-structure beam-exceptions) (fraction? fraction? list? list?) (_i "Override @code{timeSignatureSettings} @@ -952,14 +952,14 @@ of @var{base-moment}, @var{beat-structure}, and @var{beam-exceptions}.") (override-time-signature-setting time-signature setting))) overrideProperty = -#(define-music-function (parser location grob-property-path value) +#(define-music-function (grob-property-path value) (symbol-list? scheme?) (_i "Set the grob property specified by @var{grob-property-path} to @var{value}. @var{grob-property-path} is a symbol list of the form @code{Context.GrobName.property} or @code{GrobName.property}, possibly with subproperties given as well.") - (let ((p (check-grob-path grob-property-path parser location + (let ((p (check-grob-path grob-property-path (*parser*) (*location*) #:default 'Bottom #:min 3))) (if p @@ -982,7 +982,7 @@ with subproperties given as well.") %% pageBreak and pageTurn are music functions (iso music indentifiers), %% because music identifiers are not allowed at top-level. pageBreak = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Force a page break. May be used at toplevel (i.e., between scores or markups), or inside a score.") (make-music 'EventChord @@ -995,7 +995,7 @@ markups), or inside a score.") 'break-permission 'force)))) pageTurn = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Force a page turn between two scores or top-level markups.") (make-music 'EventChord 'page-marker #t @@ -1010,7 +1010,7 @@ pageTurn = 'break-permission 'force)))) parallelMusic = -#(define-void-function (parser location voice-ids music) (list? ly:music?) +#(define-void-function (voice-ids music) (list? ly:music?) (_i "Define parallel music sequences, separated by '|' (bar check signs), and assign them to the identifiers provided in @var{voice-ids}. @@ -1124,13 +1124,13 @@ change to the following voice." ;; ;; bind voice identifiers to the voices (for-each (lambda (voice-id voice) - (ly:parser-define! parser voice-id voice)) + (ly:parser-define! (*parser*) voice-id voice)) voice-ids voices) (ly:music-warning music (_ "ignoring parallel music without barchecks"))))) parenthesize = -#(define-music-function (parser loc arg) (ly:music?) +#(define-music-function (arg) (ly:music?) (_i "Tag @var{arg} to be parenthesized.") (if (memq 'event-chord (ly:music-property arg 'types)) @@ -1165,40 +1165,40 @@ parenthesize = >> #} )) partcombine = -#(define-music-function (parser location chord-range part1 part2) +#(define-music-function (chord-range part1 part2) ((number-pair? '(0 . 8)) ly:music? ly:music?) (_i "Take the music in @var{part1} and @var{part2} and return a music expression containing simultaneous voices, where @var{part1} and @var{part2} are combined into one voice where appropriate. Optional @var{chord-range} sets the distance in steps between notes that may be combined into a chord or unison.") - (make-directed-part-combine-music parser #f chord-range part1 part2 + (make-directed-part-combine-music (*parser*) #f chord-range part1 part2 #{ \with { \voiceOne \override DynamicLineSpanner.direction = #UP } #} #{ \with { \voiceTwo \override DynamicLineSpanner.direction = #DOWN } #} #{ #} )) partcombineUp = -#(define-music-function (parser location chord-range part1 part2) +#(define-music-function (chord-range part1 part2) ((number-pair? '(0 . 8)) ly:music? ly:music?) (_i "Take the music in @var{part1} and @var{part2} and typeset so that they share a staff with stems directed upward.") - (make-directed-part-combine-music parser UP chord-range part1 part2 + (make-directed-part-combine-music (*parser*) UP chord-range part1 part2 #{ \with { \voiceOne \override DynamicLineSpanner.direction = #UP } #} #{ \with { \voiceThree \override DynamicLineSpanner.direction = #UP } #} #{ \with { \voiceOne \override DynamicLineSpanner.direction = #UP } #} )) partcombineDown = -#(define-music-function (parser location chord-range part1 part2) +#(define-music-function (chord-range part1 part2) ((number-pair? '(0 . 8)) ly:music? ly:music?) (_i "Take the music in @var{part1} and @var{part2} and typeset so that they share a staff with stems directed downward.") - (make-directed-part-combine-music parser DOWN chord-range part1 part2 + (make-directed-part-combine-music (*parser*) DOWN chord-range part1 part2 #{ \with { \voiceFour \override DynamicLineSpanner.direction = #DOWN } #} #{ \with { \voiceTwo \override DynamicLineSpanner.direction = #DOWN } #} #{ \with { \voiceTwo \override DynamicLineSpanner.direction = #DOWN } #} )) partcombineForce = -#(define-music-function (parser location type once) (boolean-or-symbol? boolean?) +#(define-music-function (type once) (boolean-or-symbol? boolean?) (_i "Override the part-combiner.") (make-music 'EventChord 'elements (list (make-music 'PartCombineForceEvent @@ -1218,21 +1218,21 @@ partcombineAutomatic = \partcombineForce ##f ##f partcombineAutomaticOnce = \partcombineForce ##f ##t partial = -#(define-music-function (parser location dur) (ly:duration?) +#(define-music-function (dur) (ly:duration?) (_i "Make a partial measure.") ;; We use `descend-to-context' here instead of `context-spec-music' to ;; ensure \partial still works if the Timing_translator is moved (descend-to-context (context-spec-music (make-music 'PartialSet - 'origin location + 'origin (*location*) 'duration dur) 'Timing) 'Score)) pitchedTrill = #(define-music-function - (parser location main-note secondary-note) + (main-note secondary-note) (ly:music? ly:music?) (_i "Print a trill with @var{main-note} as the main note of the trill and print @var{secondary-note} as a stemless note head in parentheses.") @@ -1249,7 +1249,7 @@ print @var{secondary-note} as a stemless note head in parentheses.") (for-each (lambda (m) (ly:music-set-property! m 'pitch trill-pitch)) trill-events) (begin - (ly:input-warning location (_ "Second argument of \\pitchedTrill should be single note: ")) + (ly:input-warning (*location*) (_ "Second argument of \\pitchedTrill should be single note: ")) (display sec-note-events))) (if (eq? forced #t) @@ -1259,7 +1259,7 @@ print @var{secondary-note} as a stemless note head in parentheses.") main-note)) pushToTag = -#(define-music-function (parser location tag more music) +#(define-music-function (tag more music) (symbol? ly:music? ly:music?) (_i "Add @var{more} to the front of @code{elements} of all music expressions in @var{music} that are tagged with @var{tag}.") @@ -1271,7 +1271,7 @@ expressions in @var{music} that are tagged with @var{tag}.") music)) quoteDuring = -#(define-music-function (parser location what main-music) (string? ly:music?) +#(define-music-function (what main-music) (string? ly:music?) (_i "Indicate a section of music to be quoted. @var{what} indicates the name of the quoted voice, as specified in an @code{\\addQuote} command. @var{main-music} is used to indicate the length of music to be quoted; @@ -1281,7 +1281,7 @@ usually contains spacers or multi-measure rests.") 'quoted-music-name what)) relative = -#(define-music-function (parser location pitch music) +#(define-music-function (pitch music) ((ly:pitch?) ly:music?) (_i "Make @var{music} relative to @var{pitch}. If @var{pitch} is omitted, the first note in @var{music} is given in absolute pitch.") @@ -1303,7 +1303,7 @@ omitted, the first note in @var{music} is given in absolute pitch.") 'element music)) removeWithTag = -#(define-music-function (parser location tags music) +#(define-music-function (tags music) (symbol-list-or-symbol? ly:music?) (_i "Remove elements of @var{music} that are tagged with one of the tags in @var{tags}. @var{tags} may be either a single symbol or a list @@ -1313,7 +1313,7 @@ of symbols.") music)) resetRelativeOctave = -#(define-music-function (parser location pitch) (ly:pitch?) +#(define-music-function (pitch) (ly:pitch?) (_i "Set the octave inside a \\relative section.") (make-music 'SequentialMusic @@ -1321,14 +1321,14 @@ resetRelativeOctave = (lambda (music last-pitch) pitch))) retrograde = -#(define-music-function (parser location music) +#(define-music-function (music) (ly:music?) (_i "Return @var{music} in reverse order.") (retrograde-music music)) revertTimeSignatureSettings = #(define-music-function - (parser location time-signature) + (time-signature) (pair?) (_i "Revert @code{timeSignatureSettings} @@ -1336,7 +1336,7 @@ for time signatures of @var{time-signature}.") (revert-time-signature-setting time-signature)) rightHandFinger = -#(define-event-function (parser location finger) (number-or-markup?) +#(define-event-function (finger) (number-or-markup?) (_i "Apply @var{finger} as a fingering indication.") (make-music @@ -1345,14 +1345,14 @@ rightHandFinger = finger)) scaleDurations = -#(define-music-function (parser location fraction music) +#(define-music-function (fraction music) (fraction? ly:music?) (_i "Multiply the duration of events in @var{music} by @var{fraction}.") (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction)))) settingsFrom = -#(define-scheme-function (parser location ctx music) +#(define-scheme-function (ctx music) ((symbol?) ly:music?) (_i "Take the layout instruction events from @var{music}, optionally restricted to those applying to context type @var{ctx}, and return @@ -1402,7 +1402,7 @@ a context modification duplicating their effect.") mods)) shape = -#(define-music-function (parser location offsets item) +#(define-music-function (offsets item) (list? symbol-list-or-music?) (_i "Offset control-points of @var{item} by @var{offsets}. The argument is a list of number pairs or list of such lists. Each @@ -1445,7 +1445,7 @@ appropriate tweak applied.") #{ \once \tweak control-points #shape-curve #item #}) shiftDurations = -#(define-music-function (parser location dur dots arg) +#(define-music-function (dur dots arg) (integer? integer? ly:music?) (_i "Change the duration of @var{arg} by adding @var{dur} to the @code{durlog} of @var{arg} and @var{dots} to the @code{dots} of @var{arg}.") @@ -1453,7 +1453,7 @@ shiftDurations = (shift-duration-log arg dur dots)) single = -#(define-music-function (parser location overrides music) +#(define-music-function (overrides music) (ly:music? ly:music?) (_i "Convert @var{overrides} to tweaks and apply them to @var{music}. This does not convert @code{\\revert}, @code{\\set} or @code{\\unset}.") @@ -1477,7 +1477,7 @@ This does not convert @code{\\revert}, @code{\\set} or @code{\\unset}.") music) skip = -#(define-music-function (parser location dur) (ly:duration?) +#(define-music-function (dur) (ly:duration?) (_i "Skip forward by @var{dur}.") (make-music 'SkipMusic 'duration dur)) @@ -1489,7 +1489,7 @@ slashedGrace = the following music expression")) spacingTweaks = -#(define-music-function (parser location parameters) (list?) +#(define-music-function (parameters) (list?) (_i "Set the system stretch, by reading the 'system-stretch property of the `parameters' assoc list.") #{ @@ -1499,13 +1499,13 @@ the `parameters' assoc list.") #}) styledNoteHeads = -#(define-music-function (parser location style heads music) +#(define-music-function (style heads music) (symbol? symbol-list-or-symbol? ly:music?) (_i "Set @var{heads} in @var{music} to @var{style}.") (style-note-heads heads style music)) tag = -#(define-music-function (parser location tags music) (symbol-list-or-symbol? ly:music?) +#(define-music-function (tags music) (symbol-list-or-symbol? ly:music?) (_i "Tag the following @var{music} with @var{tags} and return the result, by adding the single symbol or symbol list @var{tags} to the @code{tags} property of @var{music}.") @@ -1518,14 +1518,14 @@ result, by adding the single symbol or symbol list @var{tags} to the music) tagGroup = -#(define-void-function (parser location tags) (symbol-list?) +#(define-void-function (tags) (symbol-list?) (_i "Define a tag group comprising the symbols in the symbol list @var{tags}. Tag groups must not overlap.") (let ((err (define-tag-group tags))) - (if err (ly:parser-error parser err location)))) + (if err (ly:parser-error (*parser*) err (*location*))))) temporary = -#(define-music-function (parser location music) +#(define-music-function (music) (ly:music?) (_i "Make any @code{\\override} in @var{music} replace an existing grob property value only temporarily, restoring the old value when a @@ -1558,7 +1558,7 @@ property-changing music that isn't an @code{\\override}.") (else (if (not warned) (begin - (ly:input-warning location (_ "Cannot make ~a revertible") + (ly:input-warning (*location*) (_ "Cannot make ~a revertible") (ly:music-property m 'name)) (set! warned #t))) #t)))) @@ -1566,7 +1566,7 @@ property-changing music that isn't an @code{\\override}.") music) time = -#(define-music-function (parser location beat-structure fraction) +#(define-music-function (beat-structure fraction) ((number-list? '()) fraction?) (_i "Set @var{fraction} as time signature, with optional number list @var{beat-structure} before it.") @@ -1576,7 +1576,7 @@ number list @var{beat-structure} before it.") 'beat-structure beat-structure)) times = -#(define-music-function (parser location fraction music) +#(define-music-function (fraction music) (fraction? ly:music?) (_i "Scale @var{music} in time by @var{fraction}.") (make-music 'TimeScaledMusic @@ -1586,7 +1586,7 @@ times = transpose = #(define-music-function - (parser location from to music) + (from to music) (ly:pitch? ly:pitch? ly:music?) (_i "Transpose @var{music} from pitch @var{from} to pitch @var{to}.") @@ -1595,7 +1595,7 @@ transpose = transposedCueDuring = #(define-music-function - (parser location what dir pitch main-music) + (what dir pitch main-music) (string? ly:dir? ly:pitch? ly:music?) (_i "Insert notes from the part @var{what} into a voice called @code{cue}, @@ -1615,7 +1615,7 @@ as a first or second voice.") 'quoted-transposition pitch)) transposition = -#(define-music-function (parser location pitch) (ly:pitch?) +#(define-music-function (pitch) (ly:pitch?) (_i "Set instrument transposition") (context-spec-music @@ -1623,7 +1623,7 @@ transposition = 'Staff)) tuplet = -#(define-music-function (parser location ratio tuplet-span music) +#(define-music-function (ratio tuplet-span music) (fraction? (ly:duration? '()) ly:music?) (_i "Scale the given @var{music} to tuplets. @var{ratio} is a fraction that specifies how many notes are played in place of the @@ -1646,7 +1646,7 @@ quarter note.") 'duration tuplet-span)) tupletSpan = -#(define-music-function (parser location tuplet-span) +#(define-music-function (tuplet-span) ((ly:duration?)) (_i "Set @code{tupletSpannerDuration}, the length into which @code{\\tuplet} without an explicit @samp{tuplet-span} argument of its @@ -1662,7 +1662,7 @@ command without explicit @samp{tuplet-span}, use #{ \unset tupletSpannerDuration #})) tweak = -#(define-music-function (parser location prop value item) +#(define-music-function (prop value item) (symbol-list-or-symbol? scheme? symbol-list-or-music?) (_i "Add a tweak to the following @var{item}, usually music. Layout objects created by @var{item} get their property @var{prop} @@ -1686,7 +1686,7 @@ convenient. @var{prop} can contain additional elements in which case a nested property (inside of an alist) is tweaked.") (if (ly:music? item) - (let ((p (check-grob-path prop parser location + (let ((p (check-grob-path prop (*parser*) (*location*) #:start 1 #:default #t #:min 2))) @@ -1704,14 +1704,14 @@ property (inside of an alist) is tweaked.") ;; diagnostics. (let ((p (check-grob-path (append item (if (symbol? prop) (list prop) prop)) - parser location + (*parser*) (*location*) #:default 'Bottom #:min 3))) (if p #{ \override #p = #value #} (make-music 'Music))))) undo = -#(define-music-function (parser location music) +#(define-music-function (music) (ly:music?) (_i "Convert @code{\\override} and @code{\\set} in @var{music} to @code{\\revert} and @code{\\unset}, respectively. Any reverts and @@ -1752,7 +1752,7 @@ unsets already in @var{music} cause a warning. Non-property-related music is ig (else (if (not warned) (begin - (ly:input-warning location (_ "Cannot revert ~a") + (ly:input-warning (*location*) (_ "Cannot revert ~a") (ly:music-property m 'name)) (set! warned #t))) overrides))) @@ -1764,20 +1764,20 @@ unsets already in @var{music} cause a warning. Non-property-related music is ig (else (make-sequential-music lst)))))) unfoldRepeats = -#(define-music-function (parser location music) (ly:music?) +#(define-music-function (music) (ly:music?) (_i "Force any @code{\\repeat volta}, @code{\\repeat tremolo} or @code{\\repeat percent} commands in @var{music} to be interpreted as @code{\\repeat unfold}.") (unfold-repeats music)) void = -#(define-void-function (parser location arg) (scheme?) +#(define-void-function (arg) (scheme?) (_i "Accept a scheme argument, return a void expression. Use this if you want to have a scheme expression evaluated because of its side-effects, but its value ignored.")) withMusicProperty = -#(define-music-function (parser location sym val music) +#(define-music-function (sym val music) (symbol? scheme? ly:music?) (_i "Set @var{sym} to @var{val} in @var{music}.") diff --git a/ly/piano-tkit.ly b/ly/piano-tkit.ly index e7d9744e6e..73ccb6685a 100644 --- a/ly/piano-tkit.ly +++ b/ly/piano-tkit.ly @@ -1,9 +1,9 @@ -%\version "2.19.19" +%\version "2.19.22" \include "staff-tkit.ly" make-pianostaff = -#(define-music-function (parser location) () +#(define-music-function () () (if (not PianoRHMidiInstrument) (set! PianoRHMidiInstrument diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly index 6a96f047e6..acf116dd69 100644 --- a/ly/predefined-fretboards-init.ly +++ b/ly/predefined-fretboards-init.ly @@ -15,7 +15,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>. -\version "2.16.0" +\version "2.19.22" % chord-shape-table is a hash-table of chord shapes % in the form of diagram-descriptions that can be @@ -30,7 +30,7 @@ % chord-shape-table addChordShape = -#(define-void-function (parser location key-symbol tuning shape-definition) +#(define-void-function (key-symbol tuning shape-definition) (symbol? pair? string-or-pair?) (_i "Add chord shape @var{shape-definition} to the @var{chord-shape-table} hash with the key @code{(cons @var{key-symbol} @var{tuning})}.") @@ -62,7 +62,7 @@ table @code{rest}." storePredefinedDiagram = #(define-void-function - (parser location fretboard-table chord tuning diagram-definition) + (fretboard-table chord tuning diagram-definition) (hash-table? ly:music? pair? string-or-pair?) (_i "Add predefined fret diagram defined by @var{diagram-definition} for the chord pitches @var{chord} and the stringTuning @var{tuning}.") diff --git a/ly/property-init.ly b/ly/property-init.ly index fd41de8bef..7a06995ffe 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.17.24" +\version "2.19.22" %% for dashed slurs, phrasing slurs, and ties #(define (make-simple-dash-definition dash-fraction dash-period) @@ -9,14 +9,14 @@ %% common definition for all note head styles reverting %% (palm mute, harmonics, dead notes, ...) defaultNoteHeads = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Revert to the default note head style.") (context-spec-music (revert-head-style '(NoteHead TabNoteHead)) 'Bottom)) accidentalStyle = #(define-music-function - (parser location style) (symbol-list?) + (style) (symbol-list?) (_i "Set accidental style to symbol list @var{style} in the form @samp{piano-cautionary}. If @var{style} has a form like @samp{Staff.piano-cautionary}, the settings are applied to that @@ -26,8 +26,8 @@ piano styles, which use @samp{GrandStaff} as a context." ) ((1) (set-accidental-style (car style))) ((2) (set-accidental-style (cadr style) (car style))) (else - (ly:parser-error parser (_ "not an accidental style") - location) + (ly:parser-error (*parser*) (_ "not an accidental style") + (*location*)) (make-music 'Music)))) %% arpeggios @@ -92,7 +92,7 @@ balloonLengthOff = { defineBarLine = #(define-void-function - (parser location bar glyph-list) (string? list?) + (bar glyph-list) (string? list?) (_i "Define bar line settings for bar line @var{bar}. The list @var{glyph-list} must have three entries which define the appearance at the end of line, at the beginning of the next line, @@ -224,13 +224,13 @@ glissando = #(make-music 'GlissandoEvent) %% harmonics harmonicsOn = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Set the default note head style to a diamond-shaped style.") (context-spec-music (override-head-style '(NoteHead TabNoteHead) 'harmonic) 'Bottom)) harmonicsOff = \defaultNoteHeads harmonicNote = -#(define-music-function (parser location note) (ly:music?) +#(define-music-function (note) (ly:music?) (_i "Print @var{note} with a diamond-shaped note head.") (style-note-heads 'NoteHead 'harmonic note)) @@ -279,7 +279,7 @@ improvisationOff = { %% incipit incipit = -#(define-music-function (parser location incipit-music) (ly:music?) +#(define-music-function (incipit-music) (ly:music?) (_i "Output @var{incipit-music} before the main staff as an indication of its appearance in the original music.") #{ @@ -395,13 +395,13 @@ defaultTimeSignature = \revert Staff.TimeSignature.style %% palm mutes palmMuteOn = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Set the default note head style to a triangle-shaped style.") (context-spec-music (override-head-style 'NoteHead 'do) 'Bottom)) palmMuteOff = \defaultNoteHeads palmMute = -#(define-music-function (parser location note) (ly:music?) +#(define-music-function (note) (ly:music?) (_i "Print @var{note} with a triangle-shaped note head.") (style-note-heads 'NoteHead 'do note)) @@ -415,7 +415,7 @@ phrasingSlurNeutral = \revert PhrasingSlur.direction % dash-patterns (make-simple-dash-definition defined at top of file) phrasingSlurDashPattern = -#(define-music-function (parser location dash-fraction dash-period) +#(define-music-function (dash-fraction dash-period) (number? number?) (_i "Set up a custom style of dash pattern for @var{dash-fraction} ratio of line to space repeated at @var{dash-period} interval for phrasing slurs.") @@ -440,20 +440,20 @@ phrasingSlurSolid = %% point and click pointAndClickOn = -#(define-void-function (parser location) () +#(define-void-function () () (_i "Enable generation of code in final-format (e.g. pdf) files to reference the originating lilypond source statement; this is helpful when developing a score but generates bigger final-format files.") (ly:set-option 'point-and-click #t)) pointAndClickOff = -#(define-void-function (parser location) () +#(define-void-function () () (_i "Suppress generating extra code in final-format (e.g. pdf) files to point back to the lilypond source statement.") (ly:set-option 'point-and-click #f)) pointAndClickTypes = -#(define-void-function (parser location types) (symbol-list-or-symbol?) +#(define-void-function (types) (symbol-list-or-symbol?) (_i "Set a type or list of types (such as @code{#'note-event}) for which point-and-click info is generated.") (ly:set-option 'point-and-click types)) @@ -502,7 +502,7 @@ slurNeutral = \revert Slur.direction % dash-patterns (make-simple-dash-definition defined at top of file) slurDashPattern = -#(define-music-function (parser location dash-fraction dash-period) +#(define-music-function (dash-fraction dash-period) (number? number?) (_i "Set up a custom style of dash pattern for @var{dash-fraction} ratio of line to space repeated at @var{dash-period} interval for slurs.") @@ -657,7 +657,7 @@ tieNeutral = \revert Tie.direction % dash-patterns (make-simple-dash-definition defined at top of file) tieDashPattern = -#(define-music-function (parser location dash-fraction dash-period) +#(define-music-function (dash-fraction dash-period) (number? number?) (_i "Set up a custom style of dash pattern for @var{dash-fraction} ratio of line to space repeated at @var{dash-period} interval for ties.") @@ -728,19 +728,19 @@ voiceNeutralStyle = { %% volta brackets allowVoltaHook = -#(define-void-function (parser location bar) (string?) +#(define-void-function (bar) (string?) (allow-volta-hook bar)) %% x notes xNotesOn = -#(define-music-function (parser location) () +#(define-music-function () () (_i "Set the default note head style to a cross-shaped style.") (context-spec-music (override-head-style '(TabNoteHead NoteHead) 'cross) 'Bottom)) xNotesOff = \defaultNoteHeads xNote = -#(define-music-function (parser location note) (ly:music?) +#(define-music-function (note) (ly:music?) (_i "Print @var{note} with a cross-shaped note head.") (style-note-heads '(TabNoteHead NoteHead) 'cross note)) diff --git a/ly/staff-tkit.ly b/ly/staff-tkit.ly index a0f827a5c4..2902208bff 100644 --- a/ly/staff-tkit.ly +++ b/ly/staff-tkit.ly @@ -1,4 +1,4 @@ -%\version "2.19.19" +%\version "2.19.22" \include "voice-tkit.ly" @@ -18,7 +18,7 @@ make-one-voice-staff = -#(define-music-function (parser location show-instrName name clef dynamic-direction) +#(define-music-function (show-instrName name clef dynamic-direction) ((boolean? #t) voice-prefix? string? (up-or-down? "")) "Make a staff with one voice (no lyrics) @@ -73,7 +73,7 @@ make-one-voice-staff = make-two-voice-staff = -#(define-music-function (parser location name clef v1name v2name) +#(define-music-function (name clef v1name v2name) (voice-prefix? string? voice-prefix? voice-prefix?) "Make a vocal staff with two voices diff --git a/ly/string-tunings-init.ly b/ly/string-tunings-init.ly index 3564df58d6..5503416966 100644 --- a/ly/string-tunings-init.ly +++ b/ly/string-tunings-init.ly @@ -15,7 +15,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>. -\version "2.16.0" +\version "2.19.22" %% A stringTuning is a list of pitches ordered by string number %% from 1 to N. @@ -27,7 +27,7 @@ %% lowest string number stringTuning = -#(define-scheme-function (parser location chord) +#(define-scheme-function (chord) (ly:music?) (_i "Convert @var{chord} to a string tuning. @var{chord} must be in absolute pitches and should have the highest @@ -38,11 +38,11 @@ string number (generally the lowest pitch) first.") defaultStringTunings = #'() makeDefaultStringTuning = -#(define-void-function (parser location symbol pitches) (symbol? list?) +#(define-void-function (symbol pitches) (symbol? list?) (_i "This defines a string tuning @var{symbol} via a list of @var{pitches}. The @var{symbol} also gets registered in @code{defaultStringTunings} for documentation purposes.") - (ly:parser-define! parser symbol pitches) + (ly:parser-define! (*parser*) symbol pitches) (set! defaultStringTunings (acons symbol pitches defaultStringTunings))) %% guitar tunings diff --git a/ly/toc-init.ly b/ly/toc-init.ly index ef1f18fe8b..c3fd5ab57d 100644 --- a/ly/toc-init.ly +++ b/ly/toc-init.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" %% defined later, in a closure #(define-public (add-toc-item! markup-symbol text) @@ -58,7 +58,7 @@ Usage: @code{\\markuplist \\table-of-contents}" ) (toc-items))))) tocItem = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) "Add a line to the table of content, using the @code{tocItemMarkup} paper variable markup" (add-toc-item! 'tocItemMarkup text)) diff --git a/ly/vocal-tkit.ly b/ly/vocal-tkit.ly index cad4ea4b53..b82f56919c 100644 --- a/ly/vocal-tkit.ly +++ b/ly/vocal-tkit.ly @@ -1,10 +1,10 @@ -%\version "2.19.19" +%\version "2.19.22" \include "lyrics-tkit.ly" \include "staff-tkit.ly" make-one-voice-vocal-staff = -#(define-music-function (parser location name clef) +#(define-music-function (name clef) (voice-prefix? string?) "Make a staff with one voice and lyrics beneath @@ -25,7 +25,7 @@ make-one-voice-vocal-staff = (make-music 'SequentialMusic 'void #t))) make-two-voice-vocal-staff = -#(define-music-function (parser location name clef v1name v2name) +#(define-music-function (name clef v1name v2name) (voice-prefix? string? voice-prefix? voice-prefix?) "Make a vocal staff with two voices and lyrics above and below @@ -58,8 +58,7 @@ make-two-voice-vocal-staff = make-two-vocal-staves-with-stanzas = #(define-music-function - (parser location - upperName upperClef lowerName lowerClef + (upperName upperClef lowerName lowerClef v1name v2name v3name v4name verses) (voice-prefix? string? voice-prefix? string? voice-prefix? voice-prefix? voice-prefix? voice-prefix? list?) diff --git a/ly/voice-tkit.ly b/ly/voice-tkit.ly index daeaae4f69..c240cd5f36 100644 --- a/ly/voice-tkit.ly +++ b/ly/voice-tkit.ly @@ -1,9 +1,9 @@ -%\version "2.19.19" +%\version "2.19.22" \include "base-tkit.ly" make-voice = -#(define-music-function (parser location name) (voice-prefix?) +#(define-music-function (name) (voice-prefix?) (define music (make-id name "Music")) (if music #{ |