From db22ad98af264b424e36b161c23fed43111b5c8a Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Sat, 23 May 2015 15:34:46 +0100 Subject: [PATCH] Remove snippets from /new that are now in the LSR --- ...creating-custom-dynamics-in-midi-output.ly | 29 +- .../creating-custom-key-signatures.ly | 17 +- ...an-engraver-in-scheme--ambitus-engraver.ly | 25 +- .../snippets/displaying-grob-ancestry.ly | 17 +- ...creating-custom-dynamics-in-midi-output.ly | 34 -- .../new/creating-custom-key-signatures.ly | 36 -- ...an-engraver-in-scheme--ambitus-engraver.ly | 320 ------------------ .../snippets/new/displaying-grob-ancestry.ly | 118 ------- .../snippets/new/subdividing-beams.ly | 40 --- ...sing-warnings-for-clashing-note-columns.ly | 27 -- .../snippets/new/tweaking-clef-properties.ly | 86 ----- ...template-with-automatic-piano-reduction.ly | 101 ------ .../snippets/new/vocal-ensemble-template.ly | 93 ----- Documentation/snippets/new/vocal-headword.ly | 65 ---- Documentation/snippets/subdividing-beams.ly | 30 +- ...sing-warnings-for-clashing-note-columns.ly | 19 +- .../snippets/tweaking-clef-properties.ly | 32 +- ...template-with-automatic-piano-reduction.ly | 15 +- .../snippets/vocal-ensemble-template.ly | 27 +- Documentation/snippets/vocal-headword.ly | 19 +- 20 files changed, 106 insertions(+), 1044 deletions(-) delete mode 100644 Documentation/snippets/new/creating-custom-dynamics-in-midi-output.ly delete mode 100644 Documentation/snippets/new/creating-custom-key-signatures.ly delete mode 100644 Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly delete mode 100644 Documentation/snippets/new/displaying-grob-ancestry.ly delete mode 100644 Documentation/snippets/new/subdividing-beams.ly delete mode 100644 Documentation/snippets/new/suppressing-warnings-for-clashing-note-columns.ly delete mode 100644 Documentation/snippets/new/tweaking-clef-properties.ly delete mode 100644 Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly delete mode 100644 Documentation/snippets/new/vocal-ensemble-template.ly delete mode 100644 Documentation/snippets/new/vocal-headword.ly diff --git a/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly b/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly index 71080b7df5..e013e7af98 100644 --- a/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly +++ b/Documentation/snippets/creating-custom-dynamics-in-midi-output.ly @@ -1,27 +1,26 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.21 -\version "2.19.21" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { + lsrtags = "midi, scheme-language" - lsrtags = "scheme-language, midi" + texidoc = " +The following example shows how to create a dynamic marking, not +included in the default list, and assign it a specific value so that it +can be used to affect MIDI output. - texidoc = "The following example shows how to create a dynamic - marking, not included in the default list, and assign it a specific - value so that it can be used to affect MIDI output. - The dynamic mark @code{\\rfz} (@notation{rinforzando}) is assigned a - value of @code{0.9}." +The dynamic mark @code{\\rfz} is assigned a value of @code{0.9}. +" doctitle = "Creating custom dynamics in MIDI output" } % begin verbatim - #(define (myDynamics dynamic) (if (equal? dynamic "rfz") 0.9 diff --git a/Documentation/snippets/creating-custom-key-signatures.ly b/Documentation/snippets/creating-custom-key-signatures.ly index 78de0a0705..0488ff23a0 100644 --- a/Documentation/snippets/creating-custom-key-signatures.ly +++ b/Documentation/snippets/creating-custom-key-signatures.ly @@ -1,23 +1,22 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.18.0 +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. \version "2.18.0" \header { - lsrtags = "tweaks-and-overrides, pitches, staff-notation, contexts-and-engravers" + lsrtags = "contexts-and-engravers, pitches, staff-notation, tweaks-and-overrides" texidoc = " LilyPond supports custom key signatures. In this example, print for D minor with an extended range of printed flats. + " doctitle = "Creating custom key signatures" } % begin verbatim - \new Staff \with { \override StaffSymbol.line-count = #8 \override KeySignature.flat-positions = #'((-7 . 6)) diff --git a/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly index f284dd6d05..9f92c6f2ab 100644 --- a/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly +++ b/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly @@ -1,28 +1,25 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.7 +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. \version "2.19.7" \header { - lsrtags = "contexts-and-engravers" + texidoc = " +This example demonstrates how the ambitus engraver may be defined on +the user side, with a Scheme engraver. - texidoc = "This example demonstrates how the ambitus engraver may be - defined on the user side, with a Scheme engraver. +This is basically a rewrite in Scheme of the code from +@code{lily/ambitus-engraver.cc}. - This is basically a rewrite in Scheme of the code from - @file{lily/ambitus-engraver.cc}. " - doctitle = "Defining an engraver in Scheme: ambitus engraver" } % begin verbatim - #(use-modules (oop goops)) %%% diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly index ba68c27a01..7a75bb1a33 100644 --- a/Documentation/snippets/displaying-grob-ancestry.ly +++ b/Documentation/snippets/displaying-grob-ancestry.ly @@ -1,11 +1,10 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.12 -\version "2.19.12" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { lsrtags = "devel, scheme-language, tweaks-and-overrides" @@ -40,7 +39,7 @@ When called this way @{ - \\once \\override NoteHead.before-line-breaking = #display-ancestry + \\once \\override NoteHead #'before-line-breaking = #display-ancestry c @} diff --git a/Documentation/snippets/new/creating-custom-dynamics-in-midi-output.ly b/Documentation/snippets/new/creating-custom-dynamics-in-midi-output.ly deleted file mode 100644 index df2befd970..0000000000 --- a/Documentation/snippets/new/creating-custom-dynamics-in-midi-output.ly +++ /dev/null @@ -1,34 +0,0 @@ -\version "2.19.21" - -\header { - - lsrtags = "scheme-language, midi" - - texidoc = "The following example shows how to create a dynamic - marking, not included in the default list, and assign it a specific - value so that it can be used to affect MIDI output. - - The dynamic mark @code{\rfz} (@notation{rinforzando}) is assigned a - value of @code{0.9}." - - doctitle = "Creating custom dynamics in MIDI output" -} - -#(define (myDynamics dynamic) - (if (equal? dynamic "rfz") - 0.9 - (default-dynamic-absolute-volume dynamic))) - -\score { - \new Staff { - \set Staff.midiInstrument = #"cello" - \set Score.dynamicAbsoluteVolumeFunction = #myDynamics - \new Voice { - \relative { - a'4\pp b c-\rfz - } - } - } - \layout {} - \midi {} -} diff --git a/Documentation/snippets/new/creating-custom-key-signatures.ly b/Documentation/snippets/new/creating-custom-key-signatures.ly deleted file mode 100644 index eae99a9c8d..0000000000 --- a/Documentation/snippets/new/creating-custom-key-signatures.ly +++ /dev/null @@ -1,36 +0,0 @@ -\version "2.18.0" - -\header { - lsrtags = "tweaks-and-overrides, pitches, staff-notation, contexts-and-engravers" - - texidoc = " -LilyPond supports custom key signatures. In this example, print for D -minor with an extended range of printed flats. -" - doctitle = "Creating custom key signatures" -} - -\new Staff \with { - \override StaffSymbol.line-count = #8 - \override KeySignature.flat-positions = #'((-7 . 6)) - \override KeyCancellation.flat-positions = #'((-7 . 6)) - % presumably sharps are also printed in both octaves - \override KeySignature.sharp-positions = #'((-6 . 7)) - \override KeyCancellation.sharp-positions = #'((-6 . 7)) - - \override Clef.stencil = # - (lambda (grob)(grob-interpret-markup grob - #{ \markup\combine - \musicglyph #"clefs.C" - \translate #'(-3 . -2) - \musicglyph #"clefs.F" - #})) - clefPosition = #3 - middleCPosition = #3 - middleCClefPosition = #3 -} - -{ - \key d\minor - f bes, f bes, -} diff --git a/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly b/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly deleted file mode 100644 index 16758381c3..0000000000 --- a/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly +++ /dev/null @@ -1,320 +0,0 @@ -\version "2.19.7" - -\header { - - lsrtags = "contexts-and-engravers" - - - texidoc = "This example demonstrates how the ambitus engraver may be - defined on the user side, with a Scheme engraver. - - This is basically a rewrite in Scheme of the code from - @file{lily/ambitus-engraver.cc}. -" - - doctitle = "Defining an engraver in Scheme: ambitus engraver" -} - -#(use-modules (oop goops)) - -%%% -%%% Grob utilities -%%% -%%% These are literal rewrites of some C++ methods used by the ambitus engraver. - -#(define (ly:separation-item::add-conditional-item grob grob-item) - "Add @var{grob-item} to the array of conditional elements of @var{grob}. -Rewrite of @code{Separation_item::add_conditional_item} from @file{lily/separation-item.cc}." - (ly:pointer-group-interface::add-grob grob 'conditional-elements grob-item)) - -#(define (ly:accidental-placement::accidental-pitch accidental-grob) - "Get the pitch from the grob cause of @var{accidental-grob}. -Rewrite of @code{accidental_pitch} from @file{lily/accidental-placement.cc}." - (ly:event-property (ly:grob-property (ly:grob-parent accidental-grob Y) 'cause) - 'pitch)) - -#(define (ly:accidental-placement::add-accidental grob accidental-grob) - "Add @var{accidental-grob}, an @code{Accidental} grob, to the -list of the accidental grobs of @var{grob}, an @code{AccidentalPlacement} -grob. -Rewrite of @code{Accidental_placement::add_accidental} from @file{lily/accidental-placement.cc}." - (let ((pitch (ly:accidental-placement::accidental-pitch accidental-grob))) - (set! (ly:grob-parent accidental-grob X) grob) - (set! (ly:grob-property accidental-grob 'X-offset) - ly:grob::x-parent-positioning) - (let* ((accidentals (ly:grob-object grob 'accidental-grobs)) - (handle (assq (ly:pitch-notename pitch) accidentals)) - (entry (if handle (cdr handle) '()))) - (set! (ly:grob-object grob 'accidental-grobs) - (assq-set! accidentals - (ly:pitch-notename pitch) - (cons accidental-grob entry)))))) - -%%% -%%% Ambitus data structure -%%% - -%%% The class holds the various grobs that are created -%%% to print an ambitus: -%%% - ambitus-group: the grob that groups all the components of an ambitus -%%% (Ambitus grob); -%%% - ambitus-line: the vertical line between the upper and lower ambitus -%%% notes (AmbitusLine grob); -%%% - ambitus-up-note and ambitus-down-note: the note head and accidental -%%% for the lower and upper note of the ambitus (see class -%%% below). -%%% The other slots define the key and clef context of the engraver: -%%% - start-c0: position of middle c at the beginning of the piece. It -%%% is used to place the ambitus notes according to their pitch; -%%% - start-key-sig: the key signature at the beginning of the piece. It -%%% is used to determine if accidentals shall be printed next to ambitus -%%% notes. - -#(define-class () - (ambitus-group #:accessor ambitus-group) - (ambitus-line #:accessor ambitus-line) - (ambitus-up-note #:getter ambitus-up-note - #:init-form (make )) - (ambitus-down-note #:getter ambitus-down-note - #:init-form (make )) - (start-c0 #:accessor ambitus-start-c0 - #:init-value #f) - (start-key-sig #:accessor ambitus-start-key-sig - #:init-value '())) - -%%% Accessor for the lower and upper note data of an ambitus -#(define-method (ambitus-note (ambitus ) direction) - "If @var{direction} is @code{UP}, then return the upper ambitus note -of @var{ambitus}, otherwise return the lower ambitus note." - (if (= direction UP) - (ambitus-up-note ambitus) - (ambitus-down-note ambitus))) - -%%% The class holds the grobs that are specific to ambitus -%%% (lower and upper) notes: -%%% - head: an AmbitusNoteHead grob; -%%% - accidental: an AmbitusAccidental grob, to be possibly printed next -%%% to the ambitus note head. -%%% Moreover: -%%% - pitch is the absolute pitch of the note -%%% - cause is the note event that causes this ambitus note, i.e. the lower -%%% or upper note of the considered music sequence. - -#(define-class () - (head #:accessor ambitus-note-head - #:init-value #f) - (accidental #:accessor ambitus-note-accidental - #:init-value #f) - (cause #:accessor ambitus-note-cause - #:init-value #f) - (pitch #:accessor ambitus-note-pitch - #:init-value #f)) - -%%% -%%% Ambitus engraving logics -%%% -%%% Rewrite of the code from @file{lily/ambitus-engraver.cc}. - -#(define (make-ambitus translator) - "Build an ambitus object: initialize all the grobs and their relations. - -The Ambitus grob contain all other grobs: - Ambitus - |- AmbitusLine - |- AmbitusNoteHead for upper note - |- AmbitusAccidental for upper note - |- AmbitusNoteHead for lower note - |- AmbitusAccidental for lower note - -The parent of an accidental is the corresponding note head, -and the accidental is set as the 'accidental-grob of the note head -so that is printed by the function that prints notes." - ;; make the ambitus object - (let ((ambitus (make ))) - ;; build the Ambitus grob, which will contain all other grobs - (set! (ambitus-group ambitus) (ly:engraver-make-grob translator 'Ambitus '())) - ;; build the AmbitusLine grob (line between lower and upper note) - (set! (ambitus-line ambitus) (ly:engraver-make-grob translator 'AmbitusLine '())) - ;; build the upper and lower AmbitusNoteHead and AmbitusAccidental - (for-each (lambda (direction) - (let ((head (ly:engraver-make-grob translator 'AmbitusNoteHead '())) - (accidental (ly:engraver-make-grob translator 'AmbitusAccidental '())) - (group (ambitus-group ambitus))) - ;; The parent of the AmbitusAccidental grob is the - ;; AmbitusNoteHead grob - (set! (ly:grob-parent accidental Y) head) - ;; The AmbitusAccidental grob is set as the accidental-grob - ;; object of the AmbitusNoteHead. This is later used by the - ;; function that prints notes. - (set! (ly:grob-object head 'accidental-grob) accidental) - ;; both the note head and the accidental grobs are added - ;; to the main ambitus grob. - (ly:axis-group-interface::add-element group head) - (ly:axis-group-interface::add-element group accidental) - ;; the note head and the accidental grobs are added to the - ;; ambitus object - (set! (ambitus-note-head (ambitus-note ambitus direction)) - head) - (set! (ambitus-note-accidental (ambitus-note ambitus direction)) - accidental))) - (list DOWN UP)) - ;; The parent of the ambitus line is the lower ambitus note head - (set! (ly:grob-parent (ambitus-line ambitus) X) - (ambitus-note-head (ambitus-note ambitus DOWN))) - ;; the ambitus line is added to the ambitus main grob - (ly:axis-group-interface::add-element (ambitus-group ambitus) (ambitus-line ambitus)) - ambitus)) - -#(define-method (initialize-ambitus-state (ambitus ) translator) - "Initialize the state of @var{ambitus}, by getting the starting -position of middle C and key signature from @var{translator}'s context." - (if (not (ambitus-start-c0 ambitus)) - (begin - (set! (ambitus-start-c0 ambitus) - (ly:context-property (ly:translator-context translator) - 'middleCPosition - 0)) - (set! (ambitus-start-key-sig ambitus) - (ly:context-property (ly:translator-context translator) - 'keyAlterations))))) - -#(define-method (update-ambitus-notes (ambitus ) note-grob) - "Update the upper and lower ambitus pithes of @var{ambitus}, using -@var{note-grob}." - ;; Get the event that caused the note-grob creation - ;; and check that it is a note-event. - (let ((note-event (ly:grob-property note-grob 'cause))) - (if (ly:in-event-class? note-event 'note-event) - ;; get the pitch from the note event - (let ((pitch (ly:event-property note-event 'pitch))) - ;; if this pitch is lower than the current ambitus lower - ;; note pitch (or it has not been initialized yet), - ;; then this pitch is the new ambitus lower pitch, - ;; and conversely for upper pitch. - (for-each (lambda (direction pitch-compare) - (if (or (not (ambitus-note-pitch (ambitus-note ambitus direction))) - (pitch-compare pitch - (ambitus-note-pitch (ambitus-note ambitus direction)))) - (begin - (set! (ambitus-note-pitch (ambitus-note ambitus direction)) - pitch) - (set! (ambitus-note-cause (ambitus-note ambitus direction)) - note-event)))) - (list DOWN UP) - (list ly:pitch) translator) - "Typeset the ambitus: -- place the lower and upper ambitus notes according to their pitch and - the position of the middle C; -- typeset or delete the note accidentals, according to the key signature. - An accidental, if it is to be printed, is added to an AccidentalPlacement - grob (a grob dedicated to the placement of accidentals near a chord); -- both note heads are added to the ambitus line grob, so that a line should - be printed between them." - ;; check if there are lower and upper pitches - (if (and (ambitus-note-pitch (ambitus-note ambitus UP)) - (ambitus-note-pitch (ambitus-note ambitus DOWN))) - ;; make an AccidentalPlacement grob, for placement of note accidentals - (let ((accidental-placement (ly:engraver-make-grob - translator - 'AccidentalPlacement - (ambitus-note-accidental (ambitus-note ambitus DOWN))))) - ;; For lower and upper ambitus notes: - (for-each (lambda (direction) - (let ((pitch (ambitus-note-pitch (ambitus-note ambitus direction)))) - ;; set the cause and the staff position of the ambitus note - ;; according to the associated pitch - (set! (ly:grob-property (ambitus-note-head (ambitus-note ambitus direction)) - 'cause) - (ambitus-note-cause (ambitus-note ambitus direction))) - (set! (ly:grob-property (ambitus-note-head (ambitus-note ambitus direction)) - 'staff-position) - (+ (ambitus-start-c0 ambitus) - (ly:pitch-steps pitch))) - ;; determine if an accidental shall be printed for this note, - ;; according to the key signature - (let* ((handle (or (assoc (cons (ly:pitch-octave pitch) - (ly:pitch-notename pitch)) - (ambitus-start-key-sig ambitus)) - (assoc (ly:pitch-notename pitch) - (ambitus-start-key-sig ambitus)))) - (sig-alter (if handle (cdr handle) 0))) - (cond ((= (ly:pitch-alteration pitch) sig-alter) - ;; the note alteration is in the key signature - ;; => it does not have to be printed - (ly:grob-suicide! - (ambitus-note-accidental (ambitus-note ambitus direction))) - (set! (ly:grob-object (ambitus-note-head (ambitus-note ambitus direction)) - 'accidental-grob) - '())) - (else - ;; otherwise, the accidental shall be printed - (set! (ly:grob-property (ambitus-note-accidental - (ambitus-note ambitus direction)) - 'alteration) - (ly:pitch-alteration pitch))))) - ;; add the AccidentalPlacement grob to the - ;; conditional items of the AmbitusNoteHead - (ly:separation-item::add-conditional-item - (ambitus-note-head (ambitus-note ambitus direction)) - accidental-placement) - ;; add the AmbitusAccidental to the list of the - ;; AccidentalPlacement grob accidentals - (ly:accidental-placement::add-accidental - accidental-placement - (ambitus-note-accidental (ambitus-note ambitus direction))) - ;; add the AmbitusNoteHead grob to the AmbitusLine grob - (ly:pointer-group-interface::add-grob - (ambitus-line ambitus) - 'note-heads - (ambitus-note-head (ambitus-note ambitus direction))))) - (list DOWN UP)) - ;; add the AccidentalPlacement grob to the main Ambitus grob - (ly:axis-group-interface::add-element (ambitus-group ambitus) accidental-placement)) - ;; no notes ==> suicide the grobs - (begin - (for-each (lambda (direction) - (ly:grob-suicide! (ambitus-note-accidental (ambitus-note ambitus direction))) - (ly:grob-suicide! (ambitus-note-head (ambitus-note ambitus direction)))) - (list DOWN UP)) - (ly:grob-suicide! ambitus-line)))) - -%%% -%%% Ambitus engraver definition -%%% -#(define ambitus-engraver - (lambda (context) - (let ((ambitus #f)) - ;; when music is processed: make the ambitus object, if not already built - (make-engraver - ((process-music translator) - (if (not ambitus) - (set! ambitus (make-ambitus translator)))) - ;; set the ambitus clef and key signature state - ((stop-translation-timestep translator) - (if ambitus - (initialize-ambitus-state ambitus translator))) - ;; when a note-head grob is built, update the ambitus notes - (acknowledgers - ((note-head-interface engraver grob source-engraver) - (if ambitus - (update-ambitus-notes ambitus grob)))) - ;; finally, typeset the ambitus according to its upper and lower notes - ;; (if any). - ((finalize translator) - (if ambitus - (typeset-ambitus ambitus translator))))))) - -%%% -%%% Example -%%% - -\score { - \new StaffGroup << - \new Staff { c'4 des' e' fis' gis' } - \new Staff { \clef "bass" c4 des ~ des ees b, } - >> - \layout { \context { \Staff \consists #ambitus-engraver } } -} diff --git a/Documentation/snippets/new/displaying-grob-ancestry.ly b/Documentation/snippets/new/displaying-grob-ancestry.ly deleted file mode 100644 index 2f8919c2d9..0000000000 --- a/Documentation/snippets/new/displaying-grob-ancestry.ly +++ /dev/null @@ -1,118 +0,0 @@ -\version "2.19.12" - -\header { - lsrtags = "devel, scheme-language, tweaks-and-overrides" - - texidoc = " -When working with grob callbacks, it can be helpful to understand a -grob's @qq{ancestry}. Most grobs have @qq{parents} which influence the -positioning of the grob. X- and Y-parents influence the horizontal and -vertical positions for the grob, respectively. Additionally, each -parent may have parents of its own. - - -Unfortunately, there are several aspects of a grob's ancestry that can -lead to confusion: - -* The types of parents a grob has may depend on context. * For some -grobs, the X- and Y-parents are the same. * A particular @qq{ancestor} -may be related to a grob in multiple ways. * The concept of -@qq{generations} is misleading. - - -For example, the @code{System} grob can be both parent (on the Y-side) -and grandparent (twice on the X-side) to a @code{VerticalAlignment} -grob. - - -This macro prints (to the console) a textual representation of a grob's -ancestry. - - -When called this way - - -@{ - \\once \\override NoteHead.before-line-breaking = #display-ancestry - c @} - - -The following output is generated: - - ------------------------------------- - -NoteHead X,Y: NoteColumn - X: PaperColumn - X,Y: System - Y: VerticalAxisGroup - X: NonMusicalPaperColumn - X,Y: System - Y: VerticalAlignment - X: NonMusicalPaperColumn - X,Y: System - Y: System - - - -" - doctitle = "Displaying grob ancestry" -} -%% http://lsr.di.unimi.it/LSR/Item?id=622 -%% see also http://www.lilypond.org/doc/v2.18/Documentation/snippets/tweaks-and-overrides#tweaks-and-overrides-displaying-grob-ancestry - -#(define (grob-name grob) - (if (ly:grob? grob) - (assoc-ref (ly:grob-property grob 'meta) 'name) - #f)) - -#(define (get-ancestry grob) - (if (not (null? (ly:grob-parent grob X))) - (list (grob-name grob) - (get-ancestry (ly:grob-parent grob X)) - (get-ancestry (ly:grob-parent grob Y))) - (grob-name grob))) - -#(define (format-ancestry lst padding) - (string-append - (symbol->string (car lst)) - "\n" - (let ((X-ancestry - (if (list? (cadr lst)) - (format-ancestry (cadr lst) (+ padding 3)) - (symbol->string (cadr lst)))) - (Y-ancestry - (if (list? (caddr lst)) - (format-ancestry (caddr lst) (+ padding 3)) - (symbol->string (caddr lst))))) - (if (equal? X-ancestry Y-ancestry) - (string-append - (format #f "~&") - (make-string padding #\space) - "X,Y: " - (if (list? (cadr lst)) - (format-ancestry (cadr lst) (+ padding 5)) - (symbol->string (cadr lst)))) - (string-append - (format #f "~&") - (make-string padding #\space) - "X: " X-ancestry - "\n" - (make-string padding #\space) - "Y: " Y-ancestry - (format #f "~&")))) - (format #f "~&"))) - -#(define (display-ancestry grob) - (format (current-error-port) - "~3&~a~2%~a~&" - (make-string 36 #\-) - (format-ancestry (get-ancestry grob) 0))) - -\relative c' { - \once \override NoteHead.before-line-breaking = #display-ancestry - f4 - \once \override Accidental.before-line-breaking = #display-ancestry - \once \override Arpeggio.before-line-breaking = #display-ancestry - 4\arpeggio -} diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly deleted file mode 100644 index 5677de1026..0000000000 --- a/Documentation/snippets/new/subdividing-beams.ly +++ /dev/null @@ -1,40 +0,0 @@ -\version "2.18.0" - -\header { - lsrtags = "rhythms" - - texidoc = " -The beams of consecutive 16th (or shorter) notes are, by default, not -subdivided. That is, the three (or more) beams stretch unbroken over -entire groups of notes. This behavior can be modified to subdivide the -beams into sub-groups by setting the property @code{subdivideBeams}. -When set, multiple beams will be subdivided at intervals defined by the -current value of @code{baseMoment} by reducing the multiple beams to -the number of beams that indicates the length of the sub-group. -Note that @code{baseMoment} -defaults to one over the denominator of the current time signature if -not set explicitly. It must be set to a fraction giving the duration of -the beam sub-group using the @code{ly:make-moment} function, as shown -in this snippet. Also, when @code{baseMoment} is changed, -@code{beatStructure} should also be changed to match the new -@code{baseMoment}: - -" - doctitle = "Subdividing beams" -} % begin verbatim - -\relative c'' { - c32[ c c c c c c c] - \set subdivideBeams = ##t - c32[ c c c c c c c] - - % Set beam sub-group length to an eighth note - \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) - c32[ c c c c c c c] - - % Set beam sub-group length to a sixteenth note - \set baseMoment = #(ly:make-moment 1/16) - \set beatStructure = #'(4 4 4 4) - c32[ c c c c c c c] -} diff --git a/Documentation/snippets/new/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/new/suppressing-warnings-for-clashing-note-columns.ly deleted file mode 100644 index cf6fe935d5..0000000000 --- a/Documentation/snippets/new/suppressing-warnings-for-clashing-note-columns.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "2.19.14" - -\header { - lsrtags = "simultaneous-notes, tweaks-and-overrides" - - texidoc = " -If notes from two voices with stems in the same direction are placed at -the same position, but the voices have no voice-specific shifts -specified, the error message @samp{warning: ignoring too many clashing -note columns} will appear when compiling the LilyPond file. This -message can be suppressed by setting the @code{'ignore-collision} -property of the @code{NoteColumn} object to @code{#t}. Please note that -this does not just suppress warnings but stops LilyPond trying to -resolve collisions at all and so may have unintended results unless -used with care. -" - doctitle = "Suppressing warnings for clashing note columns" -} - -ignore = \override NoteColumn.ignore-collision = ##t - -\relative c' { - \new Staff << - \new Voice{ \ignore \stemDown f2 g } - \new Voice{ c2 \stemDown c, } - >> -} diff --git a/Documentation/snippets/new/tweaking-clef-properties.ly b/Documentation/snippets/new/tweaking-clef-properties.ly deleted file mode 100644 index b9cdb2a33e..0000000000 --- a/Documentation/snippets/new/tweaking-clef-properties.ly +++ /dev/null @@ -1,86 +0,0 @@ -\version "2.17.18" - -\header { - lsrtags = "pitches, staff-notation, tweaks-and-overrides" - - texidoc = " -Changing the Clef glyph, its position, or the ottavation does not -change the position of subsequent notes on the staff. To get key -signatures on their correct staff lines @code{middleCClefPosition} -must also be specified, with positive or negative values moving -@emph{middle C} up or down respectively, relative to the staff's -center line. - -For example, @code{\\clef \"treble_8\"} is equivalent to setting -the @code{clefGlyph}, @code{clefPosition} (the vertical position -of the clef itself on the staff), @code{middleCPosition} and -@code{clefTransposition}. Note that when any of these properties -(except @code{middleCPosition}) are changed a new clef symbol is -printed. - -The following examples show the possibilities when setting these -properties manually. On the first line, the manual changes preserve the -standard relative positioning of clefs and notes, whereas on the second -line, they do not. - -" - doctitle = "Tweaking clef properties" -} % begin verbatim - -\layout { ragged-right = ##t } -{ - % The default treble clef - \key f \major - c'1 - % The standard bass clef - \set Staff.clefGlyph = #"clefs.F" - \set Staff.clefPosition = #2 - \set Staff.middleCPosition = #6 - \set Staff.middleCClefPosition = #6 - \key g \major - c'1 - % The baritone clef - \set Staff.clefGlyph = #"clefs.C" - \set Staff.clefPosition = #4 - \set Staff.middleCPosition = #4 - \set Staff.middleCClefPosition = #4 - \key f \major - c'1 - % The standard choral tenor clef - \set Staff.clefGlyph = #"clefs.G" - \set Staff.clefPosition = #-2 - \set Staff.clefTransposition = #-7 - \set Staff.middleCPosition = #1 - \set Staff.middleCClefPosition = #1 - \key f \major - c'1 - % A non-standard clef - \set Staff.clefPosition = #0 - \set Staff.clefTransposition = #0 - \set Staff.middleCPosition = #-4 - \set Staff.middleCClefPosition = #-4 - \key g \major - c'1 \break - - % The following clef changes do not preserve - % the normal relationship between notes, key signatures - % and clefs: - - \set Staff.clefGlyph = #"clefs.F" - \set Staff.clefPosition = #2 - c'1 - \set Staff.clefGlyph = #"clefs.G" - c'1 - \set Staff.clefGlyph = #"clefs.C" - c'1 - \set Staff.clefTransposition = #7 - c'1 - \set Staff.clefTransposition = #0 - \set Staff.clefPosition = #0 - c'1 - - % Return to the normal clef: - - \set Staff.middleCPosition = #0 - c'1 -} diff --git a/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly deleted file mode 100644 index f144448eb3..0000000000 --- a/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ /dev/null @@ -1,101 +0,0 @@ -\version "2.19.21" - -\header { - lsrtags = "automatic-notation, keyboards, template, vocal-music" - - texidoc = " -This template adds an automatic piano reduction to the standard SATB -vocal score demonstrated in @qq{Vocal ensemble template}. This -demonstrates one of the strengths of LilyPond – you can use a music -definition more than once. If any changes are made to the vocal notes -(say, @code{tenorMusic}), then the changes will also apply to the piano -reduction. - -" - doctitle = "Vocal ensemble template with automatic piano reduction" -} -\paper { - top-system-spacing.basic-distance = #10 - score-system-spacing.basic-distance = #20 - system-system-spacing.basic-distance = #20 - last-bottom-spacing.basic-distance = #10 -} - -global = { - \key c \major - \time 4/4 -} - -sopMusic = \relative { - c''4 c c8[( b)] c4 -} -sopWords = \lyricmode { - hi hi hi hi -} - -altoMusic = \relative { - e'4 f d e -} -altoWords =\lyricmode { - ha ha ha ha -} - -tenorMusic = \relative { - g4 a f g -} -tenorWords = \lyricmode { - hu hu hu hu -} - -bassMusic = \relative { - c4 c g c -} -bassWords = \lyricmode { - ho ho ho ho -} - -\score { - << - \new ChoirStaff << - \new Lyrics = "sopranos" \with { - % This is needed for lyrics above a staff - \override VerticalAxisGroup.staff-affinity = #DOWN - } - \new Staff = "women" << - \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> } - \new Voice = "altos" { \voiceTwo << \global \altoMusic >> } - >> - \new Lyrics = "altos" - \new Lyrics = "tenors" \with { - % This is needed for lyrics above a staff - \override VerticalAxisGroup.staff-affinity = #DOWN - } - - \new Staff = "men" << - \clef bass - \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> } - \new Voice = "basses" { \voiceTwo << \global \bassMusic >> } - >> - \new Lyrics = "basses" - \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords - \context Lyrics = "altos" \lyricsto "altos" \altoWords - \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords - \context Lyrics = "basses" \lyricsto "basses" \bassWords - >> - \new PianoStaff << - \new Staff << - \set Staff.printPartCombineTexts = ##f - \partcombine - << \global \sopMusic >> - << \global \altoMusic >> - >> - \new Staff << - \clef bass - \set Staff.printPartCombineTexts = ##f - \partcombine - << \global \tenorMusic >> - << \global \bassMusic >> - >> - >> - >> -} diff --git a/Documentation/snippets/new/vocal-ensemble-template.ly b/Documentation/snippets/new/vocal-ensemble-template.ly deleted file mode 100644 index 934d654cce..0000000000 --- a/Documentation/snippets/new/vocal-ensemble-template.ly +++ /dev/null @@ -1,93 +0,0 @@ -\version "2.19.21" - -\header { - lsrtags = "really-simple, template, vocal-music" - - texidoc = " -Here is a standard four-part SATB vocal score. With larger ensembles, -it is often useful to include a section which is included in all parts. -For example, the time signature and key signature are almost always the -same for all parts. Like in the @qq{Hymn} template, the four voices are -regrouped on only two staves. - -" - doctitle = "Vocal ensemble template" -} -\paper { - top-system-spacing.basic-distance = #10 - score-system-spacing.basic-distance = #20 - system-system-spacing.basic-distance = #20 - last-bottom-spacing.basic-distance = #10 -} - -global = { - \key c \major - \time 4/4 -} - -sopMusic = \relative { - c''4 c c8[( b)] c4 -} -sopWords = \lyricmode { - hi hi hi hi -} - -altoMusic = \relative { - e'4 f d e -} -altoWords = \lyricmode { - ha ha ha ha -} - -tenorMusic = \relative { - g4 a f g -} -tenorWords = \lyricmode { - hu hu hu hu -} - -bassMusic = \relative { - c4 c g c -} -bassWords = \lyricmode { - ho ho ho ho -} - -\score { - \new ChoirStaff << - \new Lyrics = "sopranos" \with { - % this is needed for lyrics above a staff - \override VerticalAxisGroup.staff-affinity = #DOWN - } - \new Staff = "women" << - \new Voice = "sopranos" { - \voiceOne - << \global \sopMusic >> - } - \new Voice = "altos" { - \voiceTwo - << \global \altoMusic >> - } - >> - \new Lyrics = "altos" - \new Lyrics = "tenors" \with { - % this is needed for lyrics above a staff - \override VerticalAxisGroup.staff-affinity = #DOWN - } - \new Staff = "men" << - \clef bass - \new Voice = "tenors" { - \voiceOne - << \global \tenorMusic >> - } - \new Voice = "basses" { - \voiceTwo << \global \bassMusic >> - } - >> - \new Lyrics = "basses" - \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords - \context Lyrics = "altos" \lyricsto "altos" \altoWords - \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords - \context Lyrics = "basses" \lyricsto "basses" \bassWords - >> -} diff --git a/Documentation/snippets/new/vocal-headword.ly b/Documentation/snippets/new/vocal-headword.ly deleted file mode 100644 index 70de0f93aa..0000000000 --- a/Documentation/snippets/new/vocal-headword.ly +++ /dev/null @@ -1,65 +0,0 @@ - -\version "2.19.20" - -\header { - lsrtags = "headword" - - texidoc = " -Vocal headword - -" - doctitle = "Vocal headword" -} - -%% http://lsr.di.unimi.it/LSR/Item?id=832 -%% see also http://lilypond.org/doc/v2.18/Documentation/notation/vocal-music - -% L. van Beethoven. Symphony No. 9 in D minor, op.125; Finale -% mm. 216 -- 236 -% Text: F. von Schiller - -\score { - \new Staff \relative c' { - \set Score.currentBarNumber = 216 - \bar "" % make first bar number be shown - \clef bass \key d \minor \time 3/4 - % \tempo "Presto" - % \compressMMRests R2.*8 - \tempo "Recitativo" - \autoBeamOff - r4^\markup { \small Baritono } r a - \appoggiatura a8 e'2. ~ - e4 d8[ cis d e] - e4 g, r8 g - bes2 a8 e - g4 f r - R2.*2 - gis2 gis4 - r4 d'4. b8 - b4 gis8([ a b cis] - e8[ d cis d)] b([ gis)] - e8 d d4 fis8([ e)] - d4 cis r - \key d \major - r4 r a' - d4.( e8[ fis e)] - e([ d)] d([ cis d a)] - g8([ fis)] fis([ e d c)] - c8([ b)] g'2~ - \once \override Script.outside-staff-priority = #1 % put fermata closer to staff - g4.\fermata ^\markup { \small \italic "ad libitum" } e8[ cis!] d - d8 a a4 r \bar "||" - - % \time 4/4 \tempo "Allegro assai" - % R1 - % e''4^\f d r2 - % R1 - % e4( ^\f d2) a8([ g)] - } - \addlyrics { - O Freun -- _ _ de, nicht die -- _ se Tö -- ne! - Son -- dern laßt uns an -- _ ge -- neh -- me -- re an -- stim -- men, - und freu -- _ _ _ _ _ _ _ den -- vol -- le -- re! - % Freu -- de, Freu -- de,__ - } -} diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly index bec7e757ea..d1def01815 100644 --- a/Documentation/snippets/subdividing-beams.ly +++ b/Documentation/snippets/subdividing-beams.ly @@ -1,10 +1,9 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.18.0 +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. \version "2.18.0" \header { @@ -17,14 +16,13 @@ entire groups of notes. This behavior can be modified to subdivide the beams into sub-groups by setting the property @code{subdivideBeams}. When set, multiple beams will be subdivided at intervals defined by the current value of @code{baseMoment} by reducing the multiple beams to -the number of beams that indicates the length of the sub-group. -Note that @code{baseMoment} -defaults to one over the denominator of the current time signature if -not set explicitly. It must be set to a fraction giving the duration of -the beam sub-group using the @code{ly:make-moment} function, as shown -in this snippet. Also, when @code{baseMoment} is changed, -@code{beatStructure} should also be changed to match the new -@code{baseMoment}: +the number of beams that indicates the length of the sub-group. Note +that @code{baseMoment} defaults to one over the denominator of the +current time signature if not set explicitly. It must be set to a +fraction giving the duration of the beam sub-group using the +@code{ly:make-moment} function, as shown in this snippet. Also, when +@code{baseMoment} is changed, @code{beatStructure} should also be +changed to match the new @code{baseMoment}: " doctitle = "Subdividing beams" @@ -44,4 +42,4 @@ in this snippet. Also, when @code{baseMoment} is changed, \set baseMoment = #(ly:make-moment 1/16) \set beatStructure = #'(4 4 4 4) c32[ c c c c c c c] -} % begin verbatim +} diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly index ec7f763945..40b6b8678f 100644 --- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly +++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly @@ -1,18 +1,17 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.14 -\version "2.19.14" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { lsrtags = "simultaneous-notes, tweaks-and-overrides" texidoc = " If notes from two voices with stems in the same direction are placed at -the same position, but the voices have no voice-specific shifts +the same position, and both voices have no shift or the same shift specified, the error message @samp{warning: ignoring too many clashing note columns} will appear when compiling the LilyPond file. This message can be suppressed by setting the @code{'ignore-collision} @@ -20,11 +19,11 @@ property of the @code{NoteColumn} object to @code{#t}. Please note that this does not just suppress warnings but stops LilyPond trying to resolve collisions at all and so may have unintended results unless used with care. + " doctitle = "Suppressing warnings for clashing note columns" } % begin verbatim - ignore = \override NoteColumn.ignore-collision = ##t \relative c' { diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly index 2a30cfa8e8..5d1e69c13a 100644 --- a/Documentation/snippets/tweaking-clef-properties.ly +++ b/Documentation/snippets/tweaking-clef-properties.ly @@ -1,11 +1,10 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.17.18 -\version "2.17.18" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" @@ -13,18 +12,19 @@ texidoc = " Changing the Clef glyph, its position, or the ottavation does not change the position of subsequent notes on the staff. To get key -signatures on their correct staff lines @code{middleCClefPosition} -must also be specified, with positive or negative values moving -@emph{middle C} up or down respectively, relative to the staff's -center line. +signatures on their correct staff lines @code{middleCClefPosition} must +also be specified, with positive or negative values moving @code{middle +C} up or down respectively, relative to the staff's center line. -For example, @code{\\clef \"treble_8\"} is equivalent to setting -the @code{clefGlyph}, @code{clefPosition} (the vertical position -of the clef itself on the staff), @code{middleCPosition} and + +For example, @code{\\clef \"treble_8\"} is equivalent to setting the +@code{clefGlyph}, @code{clefPosition} (the vertical position of the +clef itself on the staff), @code{middleCPosition} and @code{clefTransposition}. Note that when any of these properties (except @code{middleCPosition}) are changed a new clef symbol is printed. + The following examples show the possibilities when setting these properties manually. On the first line, the manual changes preserve the standard relative positioning of clefs and notes, whereas on the second @@ -34,8 +34,6 @@ line, they do not. doctitle = "Tweaking clef properties" } % begin verbatim -\layout { ragged-right = ##t } % begin verbatim - { % The default treble clef \key f \major diff --git a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly index 1f24643768..e404d43ee1 100644 --- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -1,11 +1,10 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.21 -\version "2.19.21" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { lsrtags = "automatic-notation, keyboards, template, vocal-music" diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly index ad4c0f5789..e0d4639be0 100644 --- a/Documentation/snippets/vocal-ensemble-template.ly +++ b/Documentation/snippets/vocal-ensemble-template.ly @@ -1,11 +1,10 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.21 -\version "2.19.21" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { lsrtags = "really-simple, template, vocal-music" @@ -33,28 +32,28 @@ global = { \time 4/4 } -sopMusic = \relative { - c''4 c c8[( b)] c4 +sopMusic = \relative c'' { + c4 c c8[( b)] c4 } sopWords = \lyricmode { hi hi hi hi } -altoMusic = \relative { - e'4 f d e +altoMusic = \relative c' { + e4 f d e } altoWords = \lyricmode { ha ha ha ha } -tenorMusic = \relative { +tenorMusic = \relative c' { g4 a f g } tenorWords = \lyricmode { hu hu hu hu } -bassMusic = \relative { +bassMusic = \relative c { c4 c g c } bassWords = \lyricmode { diff --git a/Documentation/snippets/vocal-headword.ly b/Documentation/snippets/vocal-headword.ly index d1a6487d4c..61137d2eee 100644 --- a/Documentation/snippets/vocal-headword.ly +++ b/Documentation/snippets/vocal-headword.ly @@ -1,12 +1,10 @@ -% DO NOT EDIT this file manually; it is automatically -% generated from Documentation/snippets/new -% Make any changes in Documentation/snippets/new/ -% and then run scripts/auxiliar/makelsr.py -% -% This file is in the public domain. -%% Note: this file works from version 2.19.20 - -\version "2.19.20" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { lsrtags = "headword" @@ -18,7 +16,6 @@ Vocal headword doctitle = "Vocal headword" } % begin verbatim - %% http://lsr.di.unimi.it/LSR/Item?id=832 %% see also http://lilypond.org/doc/v2.18/Documentation/notation/vocal-music @@ -31,8 +28,6 @@ Vocal headword \set Score.currentBarNumber = 216 \bar "" % make first bar number be shown \clef bass \key d \minor \time 3/4 - % \tempo "Presto" - % \compressMMRests R2.*8 \tempo "Recitativo" \autoBeamOff r4^\markup { \small Baritono } r a -- 2.39.2