diff options
Diffstat (limited to 'ly')
49 files changed, 429 insertions, 391 deletions
@@ -1,4 +1,5 @@ +\version "1.3.146" % a4.ly -hsize = 210.0 \mm; -vsize = 296.9 \mm; +hsize = 210.0 \mm +vsize = 296.9 \mm diff --git a/ly/accordion-defs.ly b/ly/accordion-defs.ly index c8caeabfd4..d5f9f67488 100644 --- a/ly/accordion-defs.ly +++ b/ly/accordion-defs.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index ec8ab984bb..b05101b73a 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,15 +1,15 @@ % Toplevel initialisation file. -\version "1.3.120"; +\version "1.3.146" \include "declarations.ly" \include "paper16.ly" \paper { \paperSixteen - linewidth = -1.\cm; - castingalgorithm = \Wordwrap; - "unusedentry" = "}\\def\\nolilyfooter{"; + linewidth = -1.\cm + castingalgorithm = \Wordwrap + "unusedentry" = "}\\def\\nolilyfooter{" } \score { diff --git a/ly/book-init.ly b/ly/book-init.ly index 7f268f5787..f6c865109d 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,9 +1,9 @@ % Toplevel initialisation file. -\version "1.3.120"; +\version "1.3.146" -\include "declarations.ly"; +\include "declarations.ly" \include "paper16.ly" \paper{ diff --git a/ly/catalan.ly b/ly/catalan.ly index fce6df63f4..74d42851d1 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.110"; +\version "1.3.146" diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index af0b413a5d..6366e6973a 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,18 +1,18 @@ % Toplevel initialisation file. -\version "1.3.120"; +\version "1.3.146" \include "declarations.ly" -\include "paper16.ly"; +\include "paper16.ly" \paper { \paperSixteen - linewidth = -1.0\cm; - castingalgorithm = \Wordwrap; - "unusedentry" = "}\\def\\nolilyfooter{"; + linewidth = -1.0\cm + castingalgorithm = \Wordwrap + "unusedentry" = "}\\def\\nolilyfooter{" } diff --git a/ly/center.ly b/ly/center.ly index 53743596eb..c3730fbbe8 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.120"; +\version "1.3.146" \include "declarations.ly" @@ -8,8 +8,8 @@ \paper { \paperSixteen -% linewidth = 7.\cm; - linewidth = 11.\cm; +% linewidth = 7.\cm + linewidth = 11.\cm } \maininput diff --git a/ly/chord-modifiers.ly b/ly/chord-modifiers.ly index 5c61876a88..308bd3bea7 100644 --- a/ly/chord-modifiers.ly +++ b/ly/chord-modifiers.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % urg! % @@ -5,10 +6,10 @@ (m . ,(make-pitch 0 2 -1 )) (min . ,(make-pitch 0 2 -1 )) (aug . ,(make-pitch 0 4 1 )) -; (dim . ,(make-pitch -100 4 -1 )) + (dim . ,(make-pitch -100 4 -1 )) (dim . ,(make-pitch -100 2 -1 )) ; urg, not actually a chord-modifier, but it works -; c7 -> <c bes>, c 7+ -> c b +; c7 -> <c bes>, c 7+ -> c b (maj . ,(make-pitch 0 6 1 )) ; sus4 should delete 2 too... (sus . ,(make-pitch 0 3 0 )) diff --git a/ly/declarations.ly b/ly/declarations.ly index 0cc795c25e..0bb5e95a6a 100644 --- a/ly/declarations.ly +++ b/ly/declarations.ly @@ -1,3 +1,5 @@ + +\version "1.3.146" breve = \duration #(make-duration -1 0) longa = \duration #(make-duration -2 0 ) maxima = \duration #(make-duration -3 0) @@ -17,30 +19,37 @@ smaller = -1 bigger = 1 center=0 -break = \penalty -1000000; -noBreak = \penalty 1000000; +break = \penalty #-10000 +noBreak = \penalty #10000 \include "scale-definitions.ly" melisma = \property Staff.melismaBusy = ##t melismaEnd = \property Staff.melismaBusy = ##f -papersize = "a4" + \include "engraver.ly" -\include "generic-paper.ly" -\include "paper20.ly" -singleLine = \paper { linewidth = 1.; } +singleLine = \paper { linewidth = 1. } % ugh \include "midi.ly" +papersize = "a4" +paperfile = \papersize + ".ly" + +\include "generic-paper.ly" +\include "paper20.ly" + + \include "dynamic-scripts.ly" \include "spanners.ly" \include "property.ly" -unusedEntry = \notes { c4 } % reset default duration + +% reset default duration +unusedEntry = \notes { c4 } % music = "\melodic\relative c" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 7dc6a29b31..cda93cf82a 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -34,7 +34,7 @@ (gis . ,(make-pitch -1 4 1 )) (gisis . ,(make-pitch -1 4 2 )) (asas . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) ; non-standard name for asas + (ases . ,(make-pitch -1 5 -2 )) non-standard name for asas (as . ,(make-pitch -1 5 -1 )) (a . ,(make-pitch -1 5 0 )) (ais . ,(make-pitch -1 5 1 )) @@ -49,4 +49,4 @@ -\version "1.3.110"; +\version "1.3.146" diff --git a/ly/drumpitch.ly b/ly/drumpitch.ly index 928512c847..addf137e36 100644 --- a/ly/drumpitch.ly +++ b/ly/drumpitch.ly @@ -1,7 +1,7 @@ % GM drum pitches. % I use different accidentals to distinguish drums at the same GM pitch. % Always accidental 0 (white keys) or 1 (black keys) to get the "correct" gm name. -% i.e. fis, for closed highat ; ges, for highat. +% i.e. fis, for closed highat ges, for highat. % 2001/03/25 Rune Zedeler <rune@zedeler.dk> @@ -64,7 +64,7 @@ (mutetriangle trim ,(make-pitch 1 4 1)) (triangle tri ,(make-pitch 1 4 2)) (opentriangle trio ,(make-pitch 1 5 0)) - ; "transposing" pitches: + "transposing" pitches: (oneup ua ,(make-pitch 0 1 0)) (twoup ub ,(make-pitch 0 2 0)) (threeup uc ,(make-pitch 0 3 0)) @@ -151,4 +151,4 @@ ) -\version "1.3.142"; +\version "1.3.146" diff --git a/ly/dynamic-scripts.ly b/ly/dynamic-scripts.ly index 94d9b9bab2..0f2f3e6b24 100644 --- a/ly/dynamic-scripts.ly +++ b/ly/dynamic-scripts.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index 4216d75b26..9afeff28f6 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -53,7 +53,8 @@ (eff . ,(make-pitch -1 2 -2 )) (ef . ,(make-pitch -1 2 -1 )) (e . ,(make-pitch -1 2 0 )) - (es . ,(make-pitch -1 2 1 )) ; es = E-flat in Dutch + + (es . ,(make-pitch -1 2 1 )) (ess . ,(make-pitch -1 2 2 )) (fff . ,(make-pitch -1 3 -2 )) (ff . ,(make-pitch -1 3 -1 )) @@ -68,7 +69,7 @@ (aff . ,(make-pitch -1 5 -2 )) (af . ,(make-pitch -1 5 -1 )) (a . ,(make-pitch -1 5 0 )) - (as . ,(make-pitch -1 5 1 )) ; as = A-flat in Dutch + (as . ,(make-pitch -1 5 1 )) (ass . ,(make-pitch -1 5 2 )) (bff . ,(make-pitch -1 6 -2 )) (bf . ,(make-pitch -1 6 -1 )) @@ -77,5 +78,5 @@ (bss . ,(make-pitch -1 6 2 )) ) -\version "1.3.110"; +\version "1.3.146" diff --git a/ly/engraver.ly b/ly/engraver.ly index 5a6c0eff0f..8205f6c3df 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -1,49 +1,49 @@ -\version "1.3.140" +\version "1.3.146" % % setup for Request->Element conversion. Guru-only % StaffContext=\translator { - \type "Engraver_group_engraver"; - \name Staff ; - \consists "Output_property_engraver"; + \type "Engraver_group_engraver" + \name Staff + \consists "Output_property_engraver" Generic_property_list = #generic-staff-properties - \consists "Property_engraver"; + \consists "Property_engraver" - \consists "Multi_measure_rest_engraver"; + \consists "Multi_measure_rest_engraver" - \consists "Bar_engraver"; + \consists "Bar_engraver" % Bar_engraver must be first so default bars aren't overwritten % with empty ones. -% \consists "Repeat_engraver"; - \consists "Volta_engraver"; - \consists "Separating_line_group_engraver"; +% \consists "Repeat_engraver" + \consists "Volta_engraver" + \consists "Separating_line_group_engraver" - \consists "Clef_engraver"; - \consists "Key_engraver"; - \consists "Time_signature_engraver"; - \consists "Staff_symbol_engraver"; - \consists "Collision_engraver"; - \consists "Rest_collision_engraver"; - \consists "Local_key_engraver"; - \consists "Piano_pedal_engraver"; + \consists "Clef_engraver" + \consists "Key_engraver" + \consists "Time_signature_engraver" + \consists "Staff_symbol_engraver" + \consists "Collision_engraver" + \consists "Rest_collision_engraver" + \consists "Local_key_engraver" + \consists "Piano_pedal_engraver" %{ - The Instrument_name_engraver puts the name of the instrument - (\property Staff.instrument; Staff.instr for subsequent lines) + The Instrument_name_engravei puts the name of the instrument + (\property Staff.instrument Staff.instr for subsequent lines) to the left of a staff. This is commented out, so you don't get funny things on the PianoStaff - \consists "Instrument_name_engraver"; + \consists "Instrument_name_engraver" %} - \consistsend "Axis_group_engraver"; + \consistsend "Axis_group_engraver" MinimumVerticalExtent = ##f ExtraVerticalExtent = ##f @@ -56,143 +56,143 @@ StaffContext=\translator { instrument = #"" instr = #"" - \accepts "Voice"; + \accepts "Voice" } StaffContainerContext = \translator { - \type Engraver_group_engraver; - \consists "Axis_group_engraver"; + \type Engraver_group_engraver + \consists "Axis_group_engraver" MinimumVerticalExtent = ##f ExtraVerticalExtent = ##f VerticalExtent = ##f - \accepts Staff; - \name StaffContainer; + \accepts Staff + \name StaffContainer } InnerChoirStaffContext = \translator { - \type "Engraver_group_engraver"; - \name InnerChoirStaff; - alignmentReference = \center; - \consists "System_start_delimiter_engraver"; + \type "Engraver_group_engraver" + \name InnerChoirStaff + alignmentReference = #0 + \consists "System_start_delimiter_engraver" SystemStartDelimiter \override #'glyph = #'bracket - \accepts "Staff"; - \accepts "RhythmicStaff"; - \accepts "GrandStaff"; - \accepts "PianoStaff"; - \accepts "Lyrics"; - \accepts "ChordNames"; + \accepts "Staff" + \accepts "RhythmicStaff" + \accepts "GrandStaff" + \accepts "PianoStaff" + \accepts "Lyrics" + \accepts "ChordNames" } ChoirStaffContext = \translator { \InnerChoirStaffContext - \name ChoirStaff; - \accepts "InnerChoirStaff"; - \accepts "InnerStaffGroup"; + \name ChoirStaff + \accepts "InnerChoirStaff" + \accepts "InnerStaffGroup" } RhythmicStaffContext=\translator{ - \type "Engraver_group_engraver"; + \type "Engraver_group_engraver" - \consists "Property_engraver"; - \consists "Output_property_engraver"; + \consists "Property_engraver" + \consists "Output_property_engraver" Generic_property_list = #generic-staff-properties MinimumVerticalExtent = ##f ExtraVerticalExtent = ##f VerticalExtent = ##f - \consists "Pitch_squash_engraver"; - \consists "Separating_line_group_engraver"; - \name RhythmicStaff; - \alias "Staff"; + \consists "Pitch_squash_engraver" + \consists "Separating_line_group_engraver" + \name RhythmicStaff + \alias "Staff" Bar \override #'bar-size = #4 VoltaBracket \override #'minimum-space = #15 % urg, in \pt VoltaBracket \override #'padding = #5 % urg, in \pt StaffSymbol \override #'line-count = #1 -% \consists "Repeat_engraver"; - \consists "Volta_engraver"; - \consists "Bar_engraver"; - \consists "Time_signature_engraver"; - \consists "Staff_symbol_engraver"; - \consistsend "Axis_group_engraver"; - \accepts "Voice"; +% \consists "Repeat_engraver" + \consists "Volta_engraver" + \consists "Bar_engraver" + \consists "Time_signature_engraver" + \consists "Staff_symbol_engraver" + \consistsend "Axis_group_engraver" + \accepts "Voice" } VoiceContext = \translator { - \type "Engraver_group_engraver"; - \name Voice; + \type "Engraver_group_engraver" + \name Voice Generic_property_list = #generic-voice-properties % must come before all - \consists "Voice_devnull_engraver"; - \consists "Output_property_engraver"; - \consists "Arpeggio_engraver"; + \consists "Voice_devnull_engraver" + \consists "Output_property_engraver" + \consists "Arpeggio_engraver" - \consists "Text_spanner_engraver"; - \consists "Property_engraver"; + \consists "Text_spanner_engraver" + \consists "Property_engraver" - \consists "Breathing_sign_engraver"; - \consists "Rest_engraver"; - \consists "Dot_column_engraver"; - \consists "Stem_engraver"; - \consists "Beam_engraver"; - \consists "Auto_beam_engraver"; + \consists "Breathing_sign_engraver" + % \consists "Rest_engraver" + \consists "Dot_column_engraver" + \consists "Stem_engraver" + \consists "Beam_engraver" + \consists "Auto_beam_engraver" - \consists "Chord_tremolo_engraver"; - \consists "Percent_repeat_engraver"; - \consists "Melisma_engraver"; + \consists "Chord_tremolo_engraver" + \consists "Percent_repeat_engraver" + \consists "Melisma_engraver" %{ Must come before text_engraver, but after note_column engraver. %} - \consists "Dynamic_engraver"; - \consists "Text_engraver"; - - \consists "Script_engraver"; - \consists "Script_column_engraver"; - \consists "Rhythmic_column_engraver"; - \consists "Phrasing_slur_engraver"; - \consists "Slur_engraver"; - \consists "Tie_engraver"; - \consists "Tuplet_engraver"; - \consists "Grace_position_engraver"; - \consists "A2_engraver"; - - \consists "Skip_req_swallow_translator"; - \accepts Thread; % bug if you leave out this! - \accepts Grace; + \consists "Dynamic_engraver" + \consists "Text_engraver" + + \consists "Script_engraver" + \consists "Script_column_engraver" + \consists "Rhythmic_column_engraver" + \consists "Phrasing_slur_engraver" + \consists "Slur_engraver" + \consists "Tie_engraver" + \consists "Tuplet_engraver" + \consists "Grace_position_engraver" + \consists "A2_engraver" + + \consists "Skip_req_swallow_translator" + \accepts Thread % bug if you leave out this! + \accepts Grace } GraceContext=\translator { - \type "Grace_engraver_group"; - \name "Grace"; - \consists "Output_property_engraver"; + \type "Grace_engraver_group" + \name "Grace" + \consists "Output_property_engraver" Generic_property_list = #generic-grace-properties - \consists "Note_heads_engraver"; - \consists "Local_key_engraver"; - \consists "Stem_engraver"; - \consists "Beam_engraver"; - \consists "Slur_engraver"; + \consists "Note_heads_engraver" + \consists "Local_key_engraver" + \consists "Stem_engraver" + \consists "Beam_engraver" + \consists "Slur_engraver" - \consists "Auto_beam_engraver"; - \consists "Align_note_column_engraver"; + \consists "Auto_beam_engraver" + \consists "Align_note_column_engraver" - \consists "Rhythmic_column_engraver"; + \consists "Rhythmic_column_engraver" - \consists "Dynamic_engraver";% in Grace ??? - \consists "Text_engraver"; % in Grace ??? + \consists "Dynamic_engraver"% in Grace ??? + \consists "Text_engraver" % in Grace ??? - \consists "Property_engraver"; + \consists "Property_engraver" Stem \override #'flag-style = #"grace" Stem \override #'stem-length = #6.0 @@ -215,131 +215,132 @@ GraceContext=\translator { = #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5)) weAreGraceContext = ##t - graceAccidentalSpace= 1.5 ; % in staff space + graceAccidentalSpace= #1.5 % in staff space } ThreadContext = \translator{ - \type Engraver_group_engraver; - \name Thread; + \type Engraver_group_engraver + \name Thread - \consists "Thread_devnull_engraver"; - \consists "Note_heads_engraver"; - \consists "Note_head_line_engraver"; - \consists "Output_property_engraver"; + \consists "Thread_devnull_engraver" + \consists "Note_heads_engraver" + \consists "Rest_engraver" + \consists "Note_head_line_engraver" + \consists "Output_property_engraver" Generic_property_list = #generic-thread-properties - \consists "Property_engraver"; + \consists "Property_engraver" } GrandStaffContext=\translator{ - \type "Engraver_group_engraver"; - \name GrandStaff; - \consists "Span_bar_engraver"; - \consists "Span_arpeggio_engraver"; - \consists "System_start_delimiter_engraver"; + \type "Engraver_group_engraver" + \name GrandStaff + \consists "Span_bar_engraver" + \consists "Span_arpeggio_engraver" + \consists "System_start_delimiter_engraver" SystemStartDelimiter \override #'glyph = #'brace - \consists "Property_engraver"; + \consists "Property_engraver" Generic_property_list = #generic-grand-staff-properties - \accepts "Staff"; + \accepts "Staff" } PianoStaffContext = \translator{ \GrandStaffContext - \name "PianoStaff"; + \name "PianoStaff" - \consists "Vertical_align_engraver"; + \consists "Vertical_align_engraver" - alignmentReference = \center; + alignmentReference = #0 verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback VerticalAlignment \override #'forced-distance = #12 -% \consistsend "Axis_group_engraver"; +% \consistsend "Axis_group_engraver" } InnerStaffGroupContext= \translator { - \type "Engraver_group_engraver"; - \name InnerStaffGroup; + \type "Engraver_group_engraver" + \name InnerStaffGroup - \consists "Span_bar_engraver"; - \consists "Span_arpeggio_engraver"; - \consists "Output_property_engraver"; + \consists "Span_bar_engraver" + \consists "Span_arpeggio_engraver" + \consists "Output_property_engraver" SystemStartDelimiter \override #'glyph = #'bracket - \consists "System_start_delimiter_engraver"; - \accepts "Staff"; - \accepts "RhythmicStaff"; - \accepts "GrandStaff"; - \accepts "PianoStaff"; + \consists "System_start_delimiter_engraver" + \accepts "Staff" + \accepts "RhythmicStaff" + \accepts "GrandStaff" + \accepts "PianoStaff" - \accepts "Lyrics"; - \accepts "ChordNames"; + \accepts "Lyrics" + \accepts "ChordNames" } StaffGroupContext = \translator { \InnerStaffGroupContext - \name StaffGroup; - \accepts "InnerChoirStaff"; - \accepts "ChoirStaff"; - \accepts "InnerStaffGroup"; + \name StaffGroup + \accepts "InnerChoirStaff" + \accepts "ChoirStaff" + \accepts "InnerStaffGroup" } % UGH! JUNKME LyricsVoiceContext= \translator{ - \type "Engraver_group_engraver"; - \consistsend "Axis_group_engraver"; + \type "Engraver_group_engraver" + \consistsend "Axis_group_engraver" MinimumVerticalExtent = #(cons -1.2 1.2) ExtraVerticalExtent = ##f VerticalExtent = ##f - \name LyricsVoice ; - \consists "Separating_line_group_engraver"; - \consists "Lyric_engraver"; - \consists "Extender_engraver"; - \consists "Hyphen_engraver"; - \consists "Stanza_number_engraver"; - phrasingPunctuation = #".,;:!?\"" + \name LyricsVoice + \consists "Separating_line_group_engraver" + \consists "Lyric_engraver" + \consists "Extender_engraver" + \consists "Hyphen_engraver" + \consists "Stanza_number_engraver" + phrasingPunctuation = #".,:!?\"" } NoteNamesContext = \translator { - \type "Engraver_group_engraver"; - \name NoteNames; - \consistsend "Axis_group_engraver"; + \type "Engraver_group_engraver" + \name NoteNames + \consistsend "Axis_group_engraver" MinimumVerticalExtent = ##f ExtraVerticalExtent = ##f VerticalExtent = ##f - \consists "Note_name_engraver"; - \consists "Separating_line_group_engraver"; + \consists "Note_name_engraver" + \consists "Separating_line_group_engraver" } LyricsContext = \translator { - \type "Engraver_group_engraver"; - \name Lyrics; - \consists Vertical_align_engraver; %need this for getting folded repeats right. + \type "Engraver_group_engraver" + \name Lyrics + \consists Vertical_align_engraver %need this for getting folded repeats right. Generic_property_list = #generic-lyrics-properties - \consists "Property_engraver"; - \consistsend "Axis_group_engraver"; + \consists "Property_engraver" + \consistsend "Axis_group_engraver" MinimumVerticalExtent = ##f ExtraVerticalExtent = ##f VerticalExtent = ##f - \accepts "LyricsVoice"; + \accepts "LyricsVoice" } ChordNamesContext = \translator { - \type "Engraver_group_engraver"; - \name ChordNames; + \type "Engraver_group_engraver" + \name ChordNames Generic_property_list = #generic-chord-staff-properties - \consists "Property_engraver"; - \consists "Output_property_engraver"; - \consists "Separating_line_group_engraver"; - \consists "Chord_name_engraver"; - \consists "Skip_req_swallow_translator"; - \consistsend "Axis_group_engraver"; + \consists "Property_engraver" + \consists "Output_property_engraver" + \consists "Separating_line_group_engraver" + \consists "Chord_name_engraver" + \consists "Skip_req_swallow_translator" + \consistsend "Axis_group_engraver" MinimumVerticalExtent = ##f ExtraVerticalExtent = ##f VerticalExtent = ##f @@ -350,9 +351,9 @@ ChordNamesContext = \translator { StupidScore = \translator { - \type "Score_engraver"; - \name Score; - \consists "Note_heads_engraver"; + \type "Score_engraver" + \name Score + \consists "Note_heads_engraver" } @@ -360,10 +361,10 @@ StupidScore = \translator { HaraKiriStaffContext = \translator { \StaffContext - \remove "Axis_group_engraver"; - \consistsend "Hara_kiri_engraver"; - \consists "Instrument_name_engraver"; - \accepts "Voice"; + \remove "Axis_group_engraver" + \consistsend "Hara_kiri_engraver" + \consists "Instrument_name_engraver" + \accepts "Voice" } %{ The HaraKiriStaffContexts doesn't override \name, @@ -376,33 +377,33 @@ HaraKiriStaffContext = \translator { ScoreContext = \translator { - \type Score_engraver; - \name Score; + \type Score_engraver + \name Score - \consists "Repeat_acknowledge_engraver"; - \consists "Timing_engraver"; - \consists "Output_property_engraver"; - \consists "System_start_delimiter_engraver"; - \consists "Mark_engraver"; - \consists "Break_align_engraver"; - \consists "Spacing_engraver"; - \consists "Vertical_align_engraver"; - - \consists "Lyric_phrasing_engraver"; - \consists "Bar_number_engraver"; - \consists "Span_arpeggio_engraver"; - - \accepts "Staff"; - \accepts "StaffContainer"; - \accepts "StaffGroup"; - \accepts "RhythmicStaff"; - \accepts "Lyrics"; - \accepts "ChordNames"; - \accepts "GrandStaff"; - \accepts "ChoirStaff"; - \accepts "PianoStaff"; - \accepts "NoteNames"; + \consists "Repeat_acknowledge_engraver" + \consists "Timing_engraver" + \consists "Output_property_engraver" + \consists "System_start_delimiter_engraver" + \consists "Mark_engraver" + \consists "Break_align_engraver" + \consists "Spacing_engraver" + \consists "Vertical_align_engraver" + + \consists "Lyric_phrasing_engraver" + \consists "Bar_number_engraver" + \consists "Span_arpeggio_engraver" + + \accepts "Staff" + \accepts "StaffContainer" + \accepts "StaffGroup" + \accepts "RhythmicStaff" + \accepts "Lyrics" + \accepts "ChordNames" + \accepts "GrandStaff" + \accepts "ChoirStaff" + \accepts "PianoStaff" + \accepts "NoteNames" soloText = #"Solo" soloIIText = #"Solo II" @@ -437,8 +438,8 @@ ScoreContext = \translator { clefGlyph = #"clefs-G" clefPosition = #-2 - automaticPhrasing = ##t; - alignmentReference = \down; + automaticPhrasing = ##t + alignmentReference = #-1 % \down defaultBarType = #"|" explicitClefVisibility = #all-visible @@ -468,7 +469,6 @@ ScoreContext = \translator { Staff_bar Time_signature Custos - Stanza_number ) diff --git a/ly/fragment.ly b/ly/fragment.ly index be841ce576..e0b43d71d6 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,17 +1,17 @@ % Toplevel initialisation file. -\version "1.3.120"; +\version "1.3.146" \include "declarations.ly" -\include "paper16.ly"; +\include "paper16.ly" \paper { \paperSixteen - linewidth = -1.0\cm; - castingalgorithm = \Wordwrap; - "unusedentry" = "}\\def\\nolilyfooter{"; + linewidth = -1.0\cm + castingalgorithm = \Wordwrap + "unusedentry" = "}\\def\\nolilyfooter{" } diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index bc928994e8..104d57efeb 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % % Running LilyPond on this file generates the documentation diff --git a/ly/generate-interface-doc.ly b/ly/generate-interface-doc.ly new file mode 100644 index 0000000000..a50eeaf3d0 --- /dev/null +++ b/ly/generate-interface-doc.ly @@ -0,0 +1,5 @@ + +% +% Running LilyPond on this file generates the short interface doc +% +#(eval-string (ly-gulp-file "generate-interface-doc.scm")) diff --git a/ly/generic-paper.ly b/ly/generic-paper.ly index d846d86800..df96f2abcd 100644 --- a/ly/generic-paper.ly +++ b/ly/generic-paper.ly @@ -1,7 +1,8 @@ +\version "1.3.146" \paper { - texsetting = ""; - pssetting = ""; - scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse;\n";% UGH. + texsetting = "" + pssetting = "" + scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n"% UGH. } diff --git a/ly/german-chords.ly b/ly/german-chords.ly index e158592b34..856340d12e 100644 --- a/ly/german-chords.ly +++ b/ly/german-chords.ly @@ -1,3 +1,4 @@ +\version "1.3.146" % german-chords.ly: % german/norwegian/danish? diff --git a/ly/init-as.fly b/ly/init-as.fly index 826e840974..757ca7c47e 100644 --- a/ly/init-as.fly +++ b/ly/init-as.fly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.110"; +\version "1.3.146" \include "declarations-as.ly" @@ -32,12 +32,12 @@ } \paper { \paper_as_nine - %linewidth=-1.0; - %indent = 0.0; - \translator { \StaffContext barSize = \staffheight; } + %linewidth=-1.0 + %indent = 0.0 + \translator { \StaffContext barSize = \staffheight } % no beam-slope - %\translator { \VoiceContext beamHeight = #0; } + %\translator { \VoiceContext beamHeight = #0 } } %\midi{ } } diff --git a/ly/init.fly b/ly/init.fly index 32073dbab8..640f13692f 100644 --- a/ly/init.fly +++ b/ly/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.146" \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index a5df75caf9..fea720a03c 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,8 +1,8 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.146" -\include "declarations.ly"; +\include "declarations.ly" \maininput diff --git a/ly/init.sly b/ly/init.sly index c05fa2c456..497dfd8daa 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.146" \include "declarations.ly" @@ -11,7 +11,7 @@ } \paper { - % indent = 0.0; + % indent = 0.0 } \midi{ } } diff --git a/ly/italiano.ly b/ly/italiano.ly index 92be0119a0..263d2bfab9 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ,(make-pitch -1 6 2 )) ) -\version "1.3.110"; +\version "1.3.146" @@ -1 +1,2 @@ +\version "1.3.146" diff --git a/ly/ledger.ly b/ly/ledger.ly index 6aee59cd7c..e1b774d343 100644 --- a/ly/ledger.ly +++ b/ly/ledger.ly @@ -1,7 +1,8 @@ +\version "1.3.146" % ledger.ly -hsize = 11.0 \in; -vsize = 17.0 \in; +hsize = 11.0 \in +vsize = 17.0 \in diff --git a/ly/legal.ly b/ly/legal.ly index 8ec3c9aaaa..4291b819f5 100644 --- a/ly/legal.ly +++ b/ly/legal.ly @@ -1,4 +1,5 @@ +\version "1.3.146" % legal.ly -hsize = 8.5 \in; -vsize = 14.0 \in; +hsize = 8.5 \in +vsize = 14.0 \in diff --git a/ly/letter.ly b/ly/letter.ly index 9d7cf77b23..c9be6592b5 100644 --- a/ly/letter.ly +++ b/ly/letter.ly @@ -1,6 +1,7 @@ +\version "1.3.146" % letter.ly -hsize = 8.5 \in; -vsize = 11.0 \in; +hsize = 8.5 \in +vsize = 11.0 \in diff --git a/ly/midi.ly b/ly/midi.ly index c95aae830f..a4283f4ccf 100644 --- a/ly/midi.ly +++ b/ly/midi.ly @@ -1,6 +1,7 @@ +\version "1.3.146" \midi { - \tempo 4=60; + \tempo 4=60 \include "performer.ly" -% unfold_all = "1"; +% unfold_all = "1" } diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 8a8c53418a..bba3d0ad31 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ common dutch names for notes. es means flat, is means sharp %} diff --git a/ly/norsk.ly b/ly/norsk.ly index 7142d40e3e..f6630bab93 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -1,5 +1,5 @@ -% $Id: norsk.ly,v 1.1 1998/03/25 11:38:28 arvidg Exp arvidg $ +% Idx norsk.ly,v 1.1 1998/03/25 11:38:28 arvidg Exp arvidg $ %{ @@ -21,7 +21,7 @@ duplicated all lines containing at least one "is" or "es", changed every other "is" into an "iss" and every other "es" into an "ess", added "ass" et al, and made some b->h-related changes. There may be - bugs in here; please tell me (or send patches) if you find any. + bugs in here please tell me (or send patches) if you find any. Arvid Gr=F8tting <arvidg@ifi.uio.no> @@ -104,4 +104,4 @@ -\version "1.3.110"; +\version "1.3.146" diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 78959978db..d325b9be52 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,17 +1,17 @@ % paper-as5.ly -\version "1.3.120"; +\version "1.3.146" paperAsFive = \paper { - staffheight = 5.\char; + staffheight = 5.\char \stylesheet #(as-make-style-sheet 'as5) - \translator { \StaffContext barSize = \staffheight; } + \translator { \StaffContext barSize = #5 } % no beam-slope - %\translator { \VoiceContext beamHeight = #0; } - \include "params-as.ly"; + %\translator { \VoiceContext beamHeight = #0 } + \include "params-as.ly" } \paper { \paperAsFive } diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 49e80c4b28..d35590f5af 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,15 +1,15 @@ % paper-as9.ly -\version "1.3.120"; +\version "1.3.146" paperAsNine = \paper { - staffheight = 9.\char; + staffheight = 9.\char - %\translator { \StaffContext barSize = \staffheight; } + %\translator { \StaffContext barSize = \staffheight } \stylesheet #(as-make-style-sheet 'as9) - \include "params-as.ly"; + \include "params-as.ly" } diff --git a/ly/paper.ly b/ly/paper.ly index 0a475b7350..fb9aea728c 100644 --- a/ly/paper.ly +++ b/ly/paper.ly @@ -1,14 +1,15 @@ +\version "1.3.146" % paper.ly %% Why som complicated? /MB -%linewidth20 = \hsize - 2.5 * \staffheight; -%textheight20 = \vsize - 5.0 * \staffheight; -%linewidth = \staffheight/20.0 * \linewidth20; -%textheight = \staffheight/20.0 * \textheight20; +%linewidth20 = \hsize - 2.5 * \staffheight +%textheight20 = \vsize - 5.0 * \staffheight +%linewidth = \staffheight/20.0 * \linewidth20 +%textheight = \staffheight/20.0 * \textheight20 -linewidth = \hsize - 2.\cm; +linewidth = \hsize - 2.\cm % Leave the textheight calculation to the geometry package. /MB -%textheight = \vsize - 4.\cm; +%textheight = \vsize - 4.\cm -indent = \linewidth / 14.0; +indent = \linewidth / 14.0 diff --git a/ly/paper11.ly b/ly/paper11.ly index 6a87d8b2e8..61dbaf5e08 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,12 +1,12 @@ % paper11.ly -\version "1.3.120"; +\version "1.3.146" paperEleven = \paper { - staffheight = 11.0\pt; + staffheight = 11.0\pt \stylesheet #(make-style-sheet 'paper11) - \include "params.ly"; + \include "params.ly" } \paper { \paperEleven } diff --git a/ly/paper13.ly b/ly/paper13.ly index e5d03d652d..445c37e929 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,13 +1,13 @@ % paper13.ly -\version "1.3.120"; +\version "1.3.146" paperThirteen = \paper { - staffheight = 13.0\pt; + staffheight = 13.0\pt \stylesheet #(make-style-sheet 'paper13) - \include "params.ly"; + \include "params.ly" } \paper { \paperThirteen } diff --git a/ly/paper16.ly b/ly/paper16.ly index 507e3ca5de..a03bfdd3e7 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,12 +1,12 @@ % paper16.ly -\version "1.3.120"; +\version "1.3.146" paperSixteen = \paper { - staffheight = 16.0\pt; + staffheight = 16.0\pt \stylesheet #(make-style-sheet 'paper16) - \include "params.ly"; + \include "params.ly" } \paper {\paperSixteen } diff --git a/ly/paper20.ly b/ly/paper20.ly index d30ec07880..b213bbc0ec 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,13 +1,13 @@ % paper20.ly -\version "1.3.120"; +\version "1.3.146" paperTwenty = \paper { - staffheight = 20.0\pt; + staffheight = 20.0\pt \stylesheet #(make-style-sheet 'paper20) - \include "params.ly"; + \include "params.ly" } \paper { \paperTwenty } diff --git a/ly/paper23.ly b/ly/paper23.ly index 6e9ba50546..aa08a5e756 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,12 +1,12 @@ % paper23.ly -\version "1.3.120"; +\version "1.3.146" paperTwentythree = \paper { - staffheight = 23.0\pt; + staffheight = 23.0\pt \stylesheet #(make-style-sheet 'paper23) - \include "params.ly"; + \include "params.ly" } \paper { \paperTwentythree } diff --git a/ly/paper26.ly b/ly/paper26.ly index db39985339..5ff9ece986 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,12 +1,12 @@ % paper26.ly -\version "1.3.120"; +\version "1.3.146" paperTwentysix = \paper { - staffheight = 26.0\pt; + staffheight = 26.0\pt \stylesheet #(make-style-sheet 'paper26) - \include "params.ly"; + \include "params.ly" } \paper { \paperTwentysix } diff --git a/ly/params-as.ly b/ly/params-as.ly index 2d2a6fb83c..fafb495c0a 100644 --- a/ly/params-as.ly +++ b/ly/params-as.ly @@ -1,14 +1,15 @@ +\version "1.3.146" % params-as.ly % generic paper parameters -outputscale = \staffheight / 4.0; +outputscale = \staffheight / 4.0 -linewidth = 60.0 \char; -textheight = 60.0 \char; -indent = 8.0\char; +linewidth = 60.0 \char +textheight = 60.0 \char +indent = 8.0\char -staffspace = (\staffheight - 1.0 ) / 4.0; -stafflinethickness = \staffspace / 2.0; +staffspace = (\staffheight - 1.0 ) / 4.0 +stafflinethickness = \staffspace / 2.0 \translator { \NoteNamesContext } \translator { \ScoreContext } diff --git a/ly/params.ly b/ly/params.ly index 684fe2850e..92fdaa288c 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -1,15 +1,18 @@ +\version "1.3.146" % JUNKME. -papersizename = \papersize ; +papersizename = \papersize -paperfile = \papersize + ".ly"; -% paperfile = "a4.ly"; -\include \paperfile; -\include "paper.ly"; +paperfile = \papersize + ".ly" -staffspace = \staffheight / 4.0; -stafflinethickness = \staffspace / 10.0; -outputscale = \staffheight / 4.0; +% paperfile = "a4.ly" + +\include \paperfile +\include "paper.ly" + +staffspace = \staffheight / 4.0 +stafflinethickness = \staffspace / 10.0 +outputscale = \staffheight / 4.0 \translator { \NoteNamesContext } \translator { \ScoreContext } diff --git a/ly/part-paper.ly b/ly/part-paper.ly index 2d3f1eb094..5c2c17f170 100644 --- a/ly/part-paper.ly +++ b/ly/part-paper.ly @@ -1,9 +1,10 @@ +\version "1.3.146" % JUNKME %part-paper.ly \paper { \translator { \OrchestralPartStaffContext } - \translator { \ScoreContext skipBars = ##t; } + \translator { \ScoreContext skipBars = ##t } } diff --git a/ly/performer.ly b/ly/performer.ly index 04456979a1..b44fae606f 100644 --- a/ly/performer.ly +++ b/ly/performer.ly @@ -1,130 +1,131 @@ +\version "1.3.146" % % setup for Request->Element conversion. Guru-only % StaffContext = \translator { - \type "Staff_performer"; - \name Staff; - \accepts Voice; + \type "Staff_performer" + \name Staff + \accepts Voice - \consists "Key_performer"; - \consists "Tempo_performer"; - \consists "Time_signature_performer"; + \consists "Key_performer" + \consists "Tempo_performer" + \consists "Time_signature_performer" dynamicStyle = #"dynamic" -}; +} \translator { \StaffContext } \translator { \StaffContext - \name RhythmicStaff; + \name RhythmicStaff } VoiceContext = \translator { - \type "Performer_group_performer"; - \name Voice; + \type "Performer_group_performer" + \name Voice % All notes fall to Grace if you leave Thread out (huh?) - \consists "Dynamic_performer"; - \consists "Span_dynamic_performer"; - \consists "Piano_pedal_performer"; - \consists "Grace_position_performer"; - \accepts Thread; - \accepts Grace; -}; + \consists "Dynamic_performer" + \consists "Span_dynamic_performer" + \consists "Piano_pedal_performer" + \consists "Grace_position_performer" + \accepts Thread + \accepts Grace +} \translator { \VoiceContext } ThreadContext = \translator { - \type "Performer_group_performer"; - \name Thread; - \consists "Note_performer"; - \consists "Tie_performer"; -}; + \type "Performer_group_performer" + \name Thread + \consists "Note_performer" + \consists "Tie_performer" +} \translator { \ThreadContext } \translator { - \type "Grace_performer_group"; - \name Grace; - \consists "Note_performer"; - \consists "Tie_performer"; - \consists "Swallow_performer"; + \type "Grace_performer_group" + \name Grace + \consists "Note_performer" + \consists "Tie_performer" + \consists "Swallow_performer" weAreGraceContext = #t } \translator { - \type "Performer_group_performer"; - \name VoiceTwo;\consists "Note_performer"; + \type "Performer_group_performer" + \name VoiceTwo\consists "Note_performer" } GrandStaffContext = \translator { - \type "Performer_group_performer"; - \name GrandStaff; - \accepts RhythmicStaff; - \accepts Staff; -}; + \type "Performer_group_performer" + \name GrandStaff + \accepts RhythmicStaff + \accepts Staff +} \translator { \GrandStaffContext } PianoStaffContext = \translator { - \type "Performer_group_performer"; - \name "PianoStaff"; - \accepts Staff; -}; + \type "Performer_group_performer" + \name "PianoStaff" + \accepts Staff +} \translator { \PianoStaffContext } \translator { - \type "Performer_group_performer"; - \consists "Lyric_performer"; - \name LyricsVoice; + \type "Performer_group_performer" + \consists "Lyric_performer" + \name LyricsVoice } \translator{ - \type "Performer_group_performer"; - \name ChoirStaff; - \accepts Staff; + \type "Performer_group_performer" + \name ChoirStaff + \accepts Staff } \translator { - \type "Staff_performer"; - \accepts LyricsVoice; - \name Lyrics; - \consists "Time_signature_performer"; - \consists "Tempo_performer"; + \type "Staff_performer" + \accepts LyricsVoice + \name Lyrics + \consists "Time_signature_performer" + \consists "Tempo_performer" } \translator { - \type "Staff_performer"; - \accepts ChordNameVoice; - \name ChordNames; + \type "Staff_performer" + \accepts ChordNameVoice + \name ChordNames } \translator { - \type Performer_group_performer; - \consists Note_performer; - \name ChordNameVoice; + \type Performer_group_performer + \consists Note_performer + \name ChordNameVoice } \translator { - \type Performer_group_performer; + \type Performer_group_performer - \name StaffGroup; - \accepts Staff; + \name StaffGroup + \accepts Staff } ScoreContext = \translator { - \type "Score_performer"; - - \name Score; - instrument = "bright acoustic"; - \accepts Staff; - \accepts GrandStaff; - \accepts PianoStaff; - \accepts Lyrics; - \accepts StaffGroup; - \accepts ChoirStaff; - \accepts RhythmicStaff; - \accepts ChordNames; - \consists "Swallow_performer"; + \type "Score_performer" + + \name Score + instrument = #"bright acoustic" + \accepts Staff + \accepts GrandStaff + \accepts PianoStaff + \accepts Lyrics + \accepts StaffGroup + \accepts ChoirStaff + \accepts RhythmicStaff + \accepts ChordNames + \consists "Swallow_performer" dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume instrumentEqualizer = #default-instrument-equaliser -}; +} \translator { \ScoreContext } diff --git a/ly/property.ly b/ly/property.ly index ea608e9874..6bce4b2ece 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -1,6 +1,6 @@ % property.ly -\version "1.3.110"; +\version "1.3.146" stemUp = \property Voice.Stem \override #'direction = #1 stemDown = \property Voice.Stem \override #'direction = #-1 @@ -114,10 +114,10 @@ specialkey = { % End the incipit and print a ``normal line start''. endincipit = \notes{ - \partial 16; s16 % Hack to handle e.g. \bar ".|"; \endincipit + \partial 16 s16 % Hack to handle e.g. \bar ".|" \endincipit \context Staff \outputproperty #(make-type-checker 'clef-interface) #'full-size-change = ##t \context Staff \outputproperty #(make-type-checker 'clef-interface) #'non-default = ##t - \bar ""; + \bar "" } autoBeamOff = \property Voice.noAutoBeaming = ##t diff --git a/ly/scale-definitions.ly b/ly/scale-definitions.ly index 0b48ce633a..b3268ffef9 100644 --- a/ly/scale-definitions.ly +++ b/ly/scale-definitions.ly @@ -1,3 +1,4 @@ +\version "1.3.146" major = #'( diff --git a/ly/script.ly b/ly/script.ly index a48626f78a..3407f96bc9 100644 --- a/ly/script.ly +++ b/ly/script.ly @@ -1,3 +1,4 @@ +\version "1.3.146" "dash-hat" = "marcato" diff --git a/ly/spanners.ly b/ly/spanners.ly index ae445148c4..6fd99caaba 100644 --- a/ly/spanners.ly +++ b/ly/spanners.ly @@ -1,3 +1,4 @@ +\version "1.3.146" cr = \spanrequest \start "crescendo" decr = \spanrequest \start "decrescendo" @@ -5,7 +6,7 @@ rc = \spanrequest \stop "crescendo" rced = \spanrequest \stop "decrescendo" cresc = \notes { - \commandspanrequest \start "crescendo" ; + \commandspanrequest \start "crescendo" \property Voice.crescendoText = "cresc." \property Voice.crescendoSpanner = "dashed-line" } @@ -13,19 +14,19 @@ cresc = \notes { % ah, this is handy: maybe drop resetting of properties in % dynamic-engraver ? endcresc = \notes { - \commandspanrequest \stop "crescendo"; + \commandspanrequest \stop "crescendo" \property Voice.crescendoText = ##f \property Voice.crescendoSpanner = ##f } dim = \notes { - \commandspanrequest \start "decrescendo" ; + \commandspanrequest \start "decrescendo" \property Voice.decrescendoText = "dim." \property Voice.decrescendoSpanner = "dashed-line" } enddim = \notes { - \commandspanrequest \stop "decrescendo"; + \commandspanrequest \stop "decrescendo" \property Voice.decrescendoText = ##f \property Voice.decrescendoSpanner = ##f } diff --git a/ly/svenska.ly b/ly/svenska.ly index 12869b6ac7..c9b54987e9 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ,(make-pitch -1 6 1 )) (hississ . ,(make-pitch -1 6 2 )) ) -\version "1.3.110"; +\version "1.3.146" |