X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=7de70d37329398ff5715045b1ce7fa4ef3f03c55;hb=9bef4c41f80988822469f80337c3c007e4adb4d1;hp=ed7698ef0914c29ff3778a98574a753a5d517263;hpb=794dcbdb52faf4292036cd1b0270a956cf4316a3;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index ed7698ef09..7f9a2b9699 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,22 @@ -\version "2.12.0" +%%%% This file is part of LilyPond, the GNU music typesetter. +%%%% +%%%% Copyright (C) 1996--2012 Han-Wen Nienhuys +%%%% Jan Nieuwenhuizen +%%%% +%%%% LilyPond is free software: you can redistribute it and/or modify +%%%% it under the terms of the GNU General Public License as published by +%%%% the Free Software Foundation, either version 3 of the License, or +%%%% (at your option) any later version. +%%%% +%%%% LilyPond is distributed in the hope that it will be useful, +%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%%%% GNU General Public License for more details. +%%%% +%%%% You should have received a copy of the GNU General Public License +%%%% along with LilyPond. If not, see . + +\version "2.15.39" \context { \name "Global" @@ -8,25 +26,28 @@ \defaultchild "Score" \description "Hard coded entry point for LilyPond. Cannot be tuned." \grobdescriptions #all-grob-descriptions + EventClasses = #all-event-classes } -% FIXME: replace minimum-Y-extents with proper spacing commands. - \context { \type "Engraver_group" \name "FretBoards" \description "A context for displaying fret diagrams." \consists "Fretboard_engraver" - \consists "Rest_swallow_translator" \consists "Output_property_engraver" - \consists "Skip_event_swallow_translator" \consists "Hara_kiri_engraver" \consists "Separating_line_group_engraver" \consists "Font_size_engraver" \consists "Instrument_name_engraver" - predefinedDiagramTable = #fretboard-table + %% explicitly set instrument, so it is not inherited from the parent + instrumentName = #'() + shortInstrumentName = #'() + + predefinedDiagramTable = #default-fret-table + handleNegativeFrets = #'recalculate + restrainOpenStrings = ##f } \context { @@ -35,6 +56,7 @@ \consists "Output_property_engraver" \consists "Bar_engraver" + \consists "Pure_from_neighbor_engraver" %% Bar_engraver must be first so default bars aren't overwritten %% with empty ones. @@ -57,21 +79,19 @@ \consists "Piano_pedal_engraver" \consists "Piano_pedal_align_engraver" \consists "Instrument_name_engraver" - \consists "String_number_engraver" \consists "Axis_group_engraver" \consists "Figured_bass_engraver" \consists "Figured_bass_position_engraver" \consists "Script_row_engraver" + \consists "Cue_clef_engraver" localKeySignature = #'() createSpacing = ##t - ignoreFiguredBassRest = ##t - \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) + ignoreFiguredBassRest = ##f %% explicitly set instrument, so we don't get %% weird effects when doing instrument names for %% piano staves - instrumentName = #'() shortInstrumentName = #'() @@ -94,7 +114,6 @@ \remove "Ottava_spanner_engraver" \remove "Key_engraver" \remove "Piano_pedal_engraver" - \remove "String_number_engraver" \description "Handles typesetting for percussion." @@ -114,8 +133,12 @@ \consists "Vertical_align_engraver" topLevelAlignment = ##f + \consists "Instrument_name_engraver" \consists "System_start_delimiter_engraver" systemStartDelimiter = #'SystemStartBracket + %% explicitly set instrument, so it is not inherited from the parent + instrumentName = #'() + shortInstrumentName = #'() vocalName = #'() shortVocalName = #'() @@ -126,6 +149,7 @@ \accepts "PianoStaff" \accepts "Lyrics" \accepts "ChordNames" + \accepts "FiguredBass" \accepts "ChoirStaff" \accepts "StaffGroup" \defaultchild "Staff" @@ -136,7 +160,6 @@ contained staves are not connected vertically." \context{ \type "Engraver_group" - \override VerticalAxisGroup #'minimum-Y-extent = ##f localKeySignature = #'() createSpacing = ##t @@ -144,7 +167,7 @@ contained staves are not connected vertically." \name RhythmicStaff \alias "Staff" - \override BarLine #'bar-size = #4 + \override BarLine #'bar-extent = #'(-2 . 2) \override VoltaBracket #'staff-padding = #3 \override StaffSymbol #'line-count = #1 @@ -163,6 +186,10 @@ contained staves are not connected vertically." \consists "Axis_group_engraver" \consists "Ledger_line_engraver" + %% explicitly set instrument, so it is not inherited from the parent + instrumentName = #'() + shortInstrumentName = #'() + \accepts "Voice" \accepts "CueVoice" \defaultchild "Voice" @@ -183,7 +210,6 @@ subscripts, slurs, ties, and rests. You have to instantiate this explicitly if you want to have multiple voices on the same staff." - localKeySignature = #'() \consists "Font_size_engraver" \consists "Pitched_trill_engraver" @@ -204,6 +230,7 @@ multiple voices on the same staff." \consists "Dots_engraver" \consists "Rest_engraver" \consists "Tweak_engraver" + \consists "Footnote_engraver" %% switch on to make stem directions interpolate for the %% center line. @@ -218,6 +245,7 @@ multiple voices on the same staff." \consists "New_fingering_engraver" \consists "Chord_tremolo_engraver" + \consists "Double_percent_repeat_engraver" \consists "Percent_repeat_engraver" \consists "Slash_repeat_engraver" \consists "Part_combine_engraver" @@ -241,7 +269,6 @@ multiple voices on the same staff." \consists "Tuplet_engraver" \consists "Grace_engraver" \consists "Instrument_switch_engraver" - \consists "Skip_event_swallow_translator" } \context{ @@ -252,7 +279,7 @@ multiple voices on the same staff." fontSize = #-4 \override Stem #'length-fraction = #(magstep -4) \override Beam #'length-fraction = #(magstep -4) - \override Beam #'thickness = #0.35 + \override Beam #'beam-thickness = #0.35 } \context { @@ -274,8 +301,6 @@ multiple voices on the same staff." \remove "Fingering_engraver" \remove "Cluster_spanner_engraver" - - \consists "Skip_event_swallow_translator" } \context{ @@ -287,15 +312,27 @@ multiple voices on the same staff." side, grouping the staves together. The bar lines of the contained staves are connected vertically." + \consists "Instrument_name_engraver" \consists "Span_bar_engraver" + \consists "Span_bar_stub_engraver" \consists "Span_arpeggio_engraver" \consists "System_start_delimiter_engraver" + \consists "Vertical_align_engraver" systemStartDelimiter = #'SystemStartBrace + topLevelAlignment = ##f + %% explicitly set instrument, so it is not inherited from the parent + instrumentName = #'() + shortInstrumentName = #'() \defaultchild "Staff" \accepts "Staff" + \accepts "RhythmicStaff" + \accepts "DrumStaff" + \accepts "TabStaff" + \accepts "Lyrics" \accepts "FiguredBass" \accepts "Dynamics" + \accepts "ChordNames" } \context{ @@ -303,15 +340,13 @@ contained staves are connected vertically." \name "PianoStaff" \alias "GrandStaff" - \description "Just like @code{GrandStaff} but with support for -instrument names at the start of each system." + \description "Just like @code{GrandStaff}, but the staves are only removed +together, never separately." - \consists "Instrument_name_engraver" \consists "Vertical_align_engraver" + \consists "Keep_alive_together_engraver" topLevelAlignment = ##f - \override StaffGrouper #'between-staff-spacing #'stretchability = #5 - instrumentName = #'() shortInstrumentName = #'() } @@ -323,10 +358,15 @@ instrument names at the start of each system." \consists "Vertical_align_engraver" topLevelAlignment = ##f + \consists "Instrument_name_engraver" \consists "Span_bar_engraver" + \consists "Span_bar_stub_engraver" \consists "Span_arpeggio_engraver" \consists "Output_property_engraver" systemStartDelimiter = #'SystemStartBracket + %% explicitly set instrument, so it is not inherited from the parent + instrumentName = #'() + shortInstrumentName = #'() \consists "System_start_delimiter_engraver" @@ -354,19 +394,31 @@ a collection of staves, with a bracket in front and spanning bar lines." \name Dynamics \alias Voice \consists "Output_property_engraver" + \consists "Bar_engraver" \consists "Piano_pedal_engraver" \consists "Script_engraver" \consists "New_dynamic_engraver" \consists "Dynamic_align_engraver" \consists "Text_engraver" - \consists "Skip_event_swallow_translator" + \consists "Text_spanner_engraver" \consists "Axis_group_engraver" + \consists "Tweak_engraver" pedalSustainStrings = #'("Ped." "*Ped." "*") pedalUnaCordaStrings = #'("una corda" "" "tre corde") \override VerticalAxisGroup #'staff-affinity = #CENTER - \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5) (padding . 0.5)) + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = + #'((basic-distance . 5) + (padding . 0.5)) \override TextScript #'font-shape = #'italic + \override DynamicLineSpanner #'Y-offset = #0 + \override DynamicText #'X-offset = + #(ly:make-simple-closure + `(,+ + ,(ly:make-simple-closure + (list ly:self-alignment-interface::centered-on-note-columns)) + ,(ly:make-simple-closure + (list ly:self-alignment-interface::x-aligned-on-self)))) \description "Holds a single line of dynamics, which will be centered between the staves surrounding this context." @@ -375,30 +427,37 @@ centered between the staves surrounding this context." \context{ \type "Engraver_group" - \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.75 . 2.0) \description "Corresponds to a voice with lyrics. Handles the printing of a single line of lyrics." \name "Lyrics" - instrumentName = #'() - shortInstrumentName = #'() - \consists "Lyric_engraver" \consists "Extender_engraver" \consists "Hyphen_engraver" \consists "Stanza_number_engraver" \consists "Instrument_name_engraver" - \consists "Skip_event_swallow_translator" \consists "Font_size_engraver" \consists "Hara_kiri_engraver" + \consists "Pure_from_neighbor_engraver" + searchForVoice = ##f + %% explicitly set instrument, so it is not inherited from the parent + instrumentName = #'() + shortInstrumentName = #'() \override VerticalAxisGroup #'remove-first = ##t \override VerticalAxisGroup #'remove-empty = ##t \override VerticalAxisGroup #'staff-affinity = #UP - \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5.5) (stretchability . 1) (padding . 0.5)) - \override VerticalAxisGroup #'inter-loose-line-spacing = #'((space . 2) (stretchability . 0.5) (padding . 0.2)) - \override SeparationItem #'padding = #0.2 + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = + #'((basic-distance . 5.5) + (padding . 0.5) + (stretchability . 1)) + \override VerticalAxisGroup #'nonstaff-nonstaff-spacing = + #'((basic-distance . 0) + (minimum-distance . 2.8) + (padding . 0.2) + (stretchability . 0)) + \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.5 \override InstrumentName #'self-alignment-Y = ##f %% sync with define-grobs.scm ; @@ -406,7 +465,7 @@ printing of a single line of lyrics." %% make sure that barlines aren't collapsed, when %% Bar_engraver is there. - \override BarLine #'bar-size = #0.1 + \override BarLine #'bar-extent = #'(-0.05 . 0.05) } @@ -416,13 +475,19 @@ printing of a single line of lyrics." \description "A context for printing the names of notes." \consists "Axis_group_engraver" - \override VerticalAxisGroup #'minimum-Y-extent = ##f - % FIXME: not sure what the default should be here. - \override VerticalAxisGroup #'staff-affinity = #DOWN - + \override VerticalAxisGroup #'staff-affinity = #UP + \override VerticalAxisGroup #'nonstaff-nonstaff-spacing = + #'((basic-distance . 0) + (minimum-distance . 2.8) + (padding . 0.2) + (stretchability . 0)) + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = + #'((basic-distance . 5.5) + (padding . 0.5) + (stretchability . 1)) + \override VerticalAxisGroup + #'nonstaff-unrelatedstaff-spacing #'padding = 1.5 - \consists "Rest_swallow_translator" - \consists "Skip_event_swallow_translator" \consists "Tie_engraver" \consists "Note_name_engraver" \consists "Separating_line_group_engraver" @@ -433,35 +498,16 @@ printing of a single line of lyrics." \name ChordNames \description "Typesets chord names." - \consists "Rest_swallow_translator" \consists "Output_property_engraver" \consists "Separating_line_group_engraver" \consists "Chord_name_engraver" - \consists "Skip_event_swallow_translator" \consists "Hara_kiri_engraver" % \consists "Note_spacing_engraver" - \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 2) \override VerticalAxisGroup #'remove-first = ##t \override VerticalAxisGroup #'remove-empty = ##t \override VerticalAxisGroup #'staff-affinity = #DOWN -} - - -RemoveEmptyStaffContext= \context { - \Staff - \remove "Axis_group_engraver" - \consists "Hara_kiri_engraver" - \override Beam #'auto-knee-gap = #'() - \override VerticalAxisGroup #'remove-empty = ##t -} - -AncientRemoveEmptyStaffContext = \context { -%% why not add by default? - - \RemoveEmptyStaffContext - \accepts "VaticanaVoice" - \accepts "GregorianTranscriptionVoice" - \accepts "MensuralVoice" + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5 + \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5 } \context { @@ -480,12 +526,19 @@ automatically when an output definition (a @code{\score} or @code{\layout} block) is processed." \consists "Paper_column_engraver" - \consists "Vertically_spaced_contexts_engraver" \consists "Repeat_acknowledge_engraver" \consists "Staff_collecting_engraver" - %% move the alias along with the engraver. + \alias "Timing" + %% An alias for Timing is established by the Timing_translator in + %% whatever context it is initialized, and the timing variables are + %% then copied from wherever Timing had been previously established. + %% The alias at Score level provides a target for initializing + %% Timing variables in layout definitions before any + %% Timing_translator has been run. + + % timing translator must come BEFORE bar number engraver \consists "Timing_translator" \consists "Default_bar_line_engraver" \consists "Output_property_engraver" @@ -500,6 +553,8 @@ automatically when an output definition (a @code{\score} or \consists "Stanza_number_align_engraver" \consists "Bar_number_engraver" \consists "Parenthesis_engraver" + \consists "Concurrent_hairpin_engraver" + \consists "Beam_collision_engraver" \defaultchild "Staff" @@ -510,8 +565,10 @@ automatically when an output definition (a @code{\score} or \accepts "VaticanaStaff" \accepts "GregorianTranscriptionStaff" \accepts "MensuralStaff" + \accepts "PetrucciStaff" \accepts "StaffGroup" \accepts "DrumStaff" + \accepts "KievanStaff" \accepts "Lyrics" \accepts "ChordNames" \accepts "GrandStaff" @@ -521,12 +578,13 @@ automatically when an output definition (a @code{\score} or \accepts "NoteNames" \accepts "FiguredBass" - noteToFretFunction = #determine-frets + predefinedDiagramTable = ##f soloText = #"Solo" soloIIText = #"Solo II" aDueText = #"a2" printPartCombineTexts = ##t + partCombineTextsOnNote = ##t systemStartDelimiter =#'SystemStartBar drumStyleTable = #drums-style @@ -544,18 +602,33 @@ automatically when an output definition (a @code{\score} or defaultBarType = #"|" doubleRepeatType = #":|:" - barNumberVisibility = #first-bar-number-invisible + barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers + barNumberFormatter = #robust-bar-number-function automaticBars = ##t explicitClefVisibility = #all-visible + explicitCueClefVisibility = #end-of-line-invisible explicitKeySignatureVisibility = #all-visible implicitTimeSignatureVisibility = #end-of-line-invisible repeatCountVisibility = #all-repeat-counts-visible - beamSettings = #default-beam-settings + timeSignatureSettings = #default-time-signature-settings + timeSignatureFraction = 4/4 + +%% These defaults should be the same as the rules established in +%% scm/time-signature-settings.scm for 4/4 time + measureLength = #(ly:make-moment 4 4) + baseMoment = #(ly:make-moment 1 4) + beatStructure = #'(1 1 1 1) + beamExceptions = #'((end . (((1 . 8) . (4 4)) + ((1 . 12) . (3 3 3 3))))) + beamWholeMeasure = ##t + beamHalfMeasure = ##f + autoBeaming = ##t autoBeamCheck = #default-auto-beam-check + scriptDefinitions = #default-script-alist pedalSustainStrings = #'("Ped." "*Ped." "*") @@ -588,15 +661,19 @@ automatically when an output definition (a @code{\score} or (6 . ,FLAT) (2 . ,FLAT) (5 . ,FLAT ) (1 . ,FLAT) (4 . ,FLAT) (0 . ,FLAT) (3 . ,FLAT) (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP) (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT) - (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP) + (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (1 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP) ) barCheckSynchronize = ##f %% chord names: chordNameFunction = #ignatzek-chord-names + minorChordModifier = #(make-simple-markup "m") + additionalPitchPrefix = #"" % was "add" majorSevenSymbol = #whiteTriangleMarkup - chordNameSeparator = #(make-simple-markup "/") + chordNameLowercaseMinor = ##f + chordNameSeparator = #(make-hspace-markup 0.5) + slashChordSeparator = #(make-simple-markup "/") chordNameExceptions = #ignatzekExceptions chordNoteNamer = #'() chordRootNamer = #note-name->markup @@ -613,10 +690,11 @@ automatically when an output definition (a @code{\score} or stringOneTopmost = ##t highStringOne = ##t -%% One may change the strings tuning as following : -%% The lenght of the list must be equal to the number of string +%% One may change the string tunings as follows : +%% The length of the list must be equal to the number of strings stringTunings = #guitar-tuning tablatureFormat = #fret-number-tablature-format + tabStaffLineLayoutFunction = #tablature-position-on-lines %% figuredBassFormatter = #format-bass-figure @@ -627,12 +705,13 @@ automatically when an output definition (a @code{\score} or graceSettings = #`( (Voice Stem direction ,UP) (Voice Stem font-size -3) + (Voice Flag font-size -3) (Voice NoteHead font-size -3) (Voice TabNoteHead font-size -4) (Voice Dots font-size -3) (Voice Stem length-fraction 0.8) (Voice Stem no-stem-extend #t) - (Voice Beam thickness 0.384) + (Voice Beam beam-thickness 0.384) (Voice Beam length-fraction 0.8) (Voice Accidental font-size -4) (Voice AccidentalCautionary font-size -4) @@ -643,7 +722,13 @@ automatically when an output definition (a @code{\score} or ) keepAliveInterfaces = #'( - rhythmic-grob-interface + bass-figure-interface + chord-name-interface + cluster-beacon-interface + fret-diagram-interface + lyric-syllable-interface + note-head-interface + tab-note-head-interface lyric-interface percent-repeat-item-interface percent-repeat-interface @@ -651,7 +736,9 @@ automatically when an output definition (a @code{\score} or ;; need this, as stanza numbers are items, and appear only once. stanza-number-interface ) - quotedEventTypes = #'( + % \quoteDuring is supposed to quote everything, cueDuring only the essentials + quotedEventTypes = #'(StreamEvent) + quotedCueEventTypes = #'( note-event rest-event tie-event @@ -659,7 +746,6 @@ automatically when an output definition (a @code{\score} or tuplet-span-event) instrumentTransposition = #(ly:make-pitch 0 0 0) - verticallySpacedContexts = #'(Staff) topLevelAlignment = ##t timing = ##t @@ -674,15 +760,14 @@ automatically when an output definition (a @code{\score} or \description "A context for printing a figured bass line." \consists "Figured_bass_engraver" - \consists "Note_swallow_translator" - \consists "Skip_event_swallow_translator" \consists "Separating_line_group_engraver" \consists "Hara_kiri_engraver" \override VerticalAxisGroup #'remove-empty = ##t \override VerticalAxisGroup #'remove-first = ##t \override VerticalAxisGroup #'staff-affinity = #UP - \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 2) + \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5 + \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5 } \context { @@ -692,7 +777,6 @@ automatically when an output definition (a @code{\score} or %% don't want to route anything out of here: \alias "Staff" \alias "Voice" - \consists "Swallow_engraver" \description "Silently discards all musical information given to this context." } @@ -702,46 +786,72 @@ context." \name "TabVoice" \alias "Voice" \consists "Tab_note_heads_engraver" - \consists "Tab_harmonic_engraver" + \consists "Tab_tie_follow_engraver" \remove "Note_heads_engraver" \remove "Fingering_engraver" \remove "New_fingering_engraver" + \remove "Pitched_trill_engraver" \description "Context for drawing notes in a Tab staff." %% TabStaff increase the staff-space, which in turn %% increases beam thickness and spacing; beams are %% too big. We have to adjust the beam settings: - \override Beam #'thickness = #0.32 + \override Beam #'beam-thickness = #0.32 \override Beam #'length-fraction = #0.62 + %% the same goes for tremolo beams + \override StemTremolo #'beam-thickness = #0.32 + %% NOTE: in lily/stem-tremolo.cc, we have length-fraction = 1, + %% and the tablature staff space is scaled (1.5 by default), + %% so we use the inversion of the scale factor: + \override StemTremolo #'length-fraction = #(lambda (grob) + (/ 1 (ly:staff-symbol-staff-space grob))) + \override StemTremolo #'beam-width = #stem-tremolo::calc-tab-width %% No accidental in tablature ! \remove "Accidental_engraver" - %% remove stems, beams, dots and rests ... + %% make the Stems as short as possible to minimize their influence + %% on the slur::calc-control-points routine + \override Stem #'no-stem-extend = ##t + \override Flag #'style = #'no-flag + \override Stem #'details = #'((lengths 0 0 0 0 0 0) + (beamed-lengths 0 0 0) + (beamed-minimum-free-lengths 0 0 0) + (beamed-extreme-minimum-free-lengths 0 0) + (stem-shorten 0 0)) + %% after all, the stubs of the stems may still be visible, so ... \override Stem #'stencil = ##f + \override Flag #'stencil = ##f + %% automatic beams should be suppressed for similar reasons ... + autoBeaming = ##f + %% remove beams, dots and rests ... \override Beam #'stencil = ##f + \override StemTremolo #'stencil = ##f \override Dots #'stencil = ##f \override Rest #'stencil = ##f \override MultiMeasureRest #'stencil = ##f + \override MultiMeasureRestNumber #'stencil = ##f + \override MultiMeasureRestText #'stencil = ##f %% ... all kinds of ties/slurs \override Tie #'stencil = ##f \override RepeatTie #'stencil = ##f \override LaissezVibrerTie #'stencil = ##f - \override Slur #'stencil = ##f + \override Slur #'stencil = #slur::draw-tab-slur \override PhrasingSlur #'stencil = ##f %% 'tied to' fret numbers become invisible or parenthesized, respectively) - \override Tie #'after-line-breaking = #tie::handle-tab-tie - \override RepeatTie #'after-line-breaking = #repeat-tie::parenthesize-tab-note-head + \override Tie #'after-line-breaking = #tie::handle-tab-note-head + \override RepeatTie #'after-line-breaking = #repeat-tie::handle-tab-note-head %% ... and all kinds of markups, spanners etc. \override TupletBracket #'stencil = ##f \override TupletNumber #'stencil = ##f - \override DynamicText #'transparent = ##t + \override DynamicText #'stencil = ##f \override DynamicTextSpanner #'stencil = ##f \override TextSpanner #'stencil = ##f - \override Hairpin #'transparent = ##t + \override Hairpin #'stencil = ##f \override Script #'stencil = ##f \override TextScript #'stencil = ##f + \override Glissando #'stencil = #glissando::draw-tab-glissando %% the direction for glissando lines will be automatically corrected \override Glissando #'extra-dy = #glissando::calc-tab-extra-dy \override Glissando #'bound-details #'right = #`((attach-dir . ,LEFT) @@ -760,12 +870,13 @@ context." \denies "Voice" \consists "Tab_staff_symbol_engraver" - \description "Context for generating tablature. [DOCME]" + \description "Context for generating tablature. It accepts only @code{TabVoice} +contexts and handles the line spacing, the tablature clef etc. properly." \accepts "TabVoice" \defaultchild "TabVoice" - %% 6 strings + %% 6 strings, bigger spacing \override StaffSymbol #'staff-space = #1.5 %% Don't draw stems over the tablature figures ! @@ -774,30 +885,26 @@ context." %% No accidental in tablature ! \remove "Accidental_engraver" \remove "Key_engraver" - \remove "String_number_engraver" + + \remove "Ottava_spanner_engraver" %% the clef handler \override Clef #'stencil = #clef::print-modern-tab-if-set %% no time signature \override TimeSignature #'stencil = ##f - %% better parentheses in a TabStaff - \override ParenthesesItem #'stencils = #parentheses-item::calc-tabstaff-parenthesis-stencils %% no arpeggios \override Arpeggio #'stencil = ##f + %% we ignore collision warnings that may occur due to + %% stem overlapping, because we have no stems ;-) + \override NoteColumn #'ignore-collision = ##t %% Special "TAB" clef clefGlyph = #"clefs.tab" clefPosition = #0 + %% Change string if note results in negative fret number + handleNegativeFrets = #'recalculate + %% Allow open strings even if minimumFret is set + restrainOpenStrings = ##f } -%% TODO: Gregorian Chant contexts should be moved to gregorian.ly, -%% but this does not work (is this a bug or intended behaviour?): -%% -%% If I try to do so, I get "error: unknown escaped string: -%% `\VaticanaStaff'" in params-init.ly. If I also move -%% "\context { \Vaticana*Context }" from params-init.ly to the end -%% of gregorian.ly, then I get "error: parse error, unexpected -%% TRANSLATOR: \context { \VaticanaStaff }" in -%% gregorian.ly. --jr - \context { \Voice \name "VaticanaVoice" @@ -810,6 +917,8 @@ of Editio Vaticana." \remove "Stem_engraver" \remove "Ligature_bracket_engraver" \consists "Vaticana_ligature_engraver" + \remove "Text_spanner_engraver" + \consists "Episema_engraver" %% Set default head for notes outside of \[ \]. \override NoteHead #'style = #'vaticana.punctum @@ -820,15 +929,6 @@ of Editio Vaticana." %% There are no beams in Gregorian Chant notation. autoBeaming = ##f - - %% Prepare TextSpanner for \episem{Initium|Finis} use. - %% - %% FIXME: The line @code{\override TextSpanner #'padding = #-0.1} is - %% required to force the articulation signs being placed vertically - %% tightly to the correpsonding note heads. - %% - \override TextSpanner #'style = #'line - \override TextSpanner #'padding = #-0.1 } \context { @@ -877,6 +977,7 @@ of Editio Vaticana." \Voice \name "GregorianTranscriptionVoice" \alias "Voice" + \consists "Episema_engraver" %% Removing ligature bracket engraver without replacing it by some %% other ligature engraver would cause a "Junking event: `LigatureEvent'" @@ -891,18 +992,6 @@ of Editio Vaticana." %% There are no beams in Gregorian Chant notation. autoBeaming = ##f - %% Prepare TextSpanner for \episem{Initium|Finis} use. - %% - %% N.B.: dash-fraction MUST be unset; otherwise, TextSpanner will - %% always produce dashed lines, regardless of the style property. - %% - %% FIXME: The line @code{\override TextSpanner #'padding = #-0.1} is - %% required to force the articulation signs being placed vertically - %% tightly to the correpsonding note heads. - %% - \override TextSpanner #'dash-fraction = #'() - \override TextSpanner #'style = #'line - \override TextSpanner #'padding = #-0.1 } \context { @@ -933,6 +1022,7 @@ accommodated for typesetting a piece in mensural style." %% Set default head for notes outside of \[ \]. \override NoteHead #'style = #'mensural \override Rest #'style = #'mensural + \override Flag #'style = #'mensural %% There are no beams in mensural notation. autoBeaming = ##f @@ -976,17 +1066,143 @@ accommodated for typesetting a piece in mensural style." \override Custos #'neutral-direction = #DOWN %% Accidentals are valid only once (same as - %% #(set-accidental-style 'forget)) + %% \accidentalStyle "forget") extraNatural = ##f autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1)) autoCautionaries = #'() printKeyCancellation = ##f } +\context { + \Voice + \name "PetrucciVoice" + \alias "Voice" + \description "Same as @code{Voice} context, except that it is +accommodated for typesetting a piece in Petrucci style." + + \remove "Ligature_bracket_engraver" + \consists "Mensural_ligature_engraver" + + %% Set glyph styles. + \override NoteHead #'style = #'petrucci + \override Rest #'style = #'mensural + + % Thickens and shortens stems. + \override Stem #'thickness = #1.7 + \override Stem #'length = #5 + + %% There are no beams in Petrucci notation. + autoBeaming = ##f +} + +\context { + \Staff + \name "PetrucciStaff" + \alias "Staff" + \denies "Voice" + \defaultchild "PetrucciVoice" + \accepts "PetrucciVoice" + \description "Same as @code{Staff} context, except that it is +accommodated for typesetting a piece in Petrucci style." -RemoveEmptyRhythmicStaffContext= \context { + \consists "Custos_engraver" + + \override StaffSymbol #'thickness = #1.3 + + %% Choose Petrucci g clef on 2nd line as default. + clefGlyph = #"clefs.petrucci.g" + middleCClefPosition = #-6 + middleCPosition = #-6 + clefPosition = #-2 + clefOctavation = #0 + + \override Custos #'style = #'mensural + \override Custos #'neutral-position = #3 + \override Custos #'neutral-direction = #DOWN + + %% Accidentals are valid only once (if the following note is different) + extraNatural = ##f + autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0) + ,neo-modern-accidental-rule) + autoCautionaries = #'() + printKeyCancellation = ##f +} + +\context { + \Voice + \name "KievanVoice" + \alias "Voice" + \description "Same as @code{Voice} context, except that it is +accommodated for typesetting a piece in Kievan style." + + %% Set glyph styles. + \override NoteHead #'style = #'kievan + \override Rest #'style = #'mensural + \override Accidental #'glyph-name-alist = #alteration-kievan-glyph-name-alist + \override Dots #'style = #'kievan + \override Slur #'stencil = ##f + + %% There are beams in Kievan notation, but they are invoked manually + autoBeaming = ##f + \override Beam #'beam-thickness = #0.32 + \override Beam #'length-fraction = #0.62 +} + +\context { + \Staff + \name "KievanStaff" + \alias "Staff" + \denies "Voice" + \defaultchild "KievanVoice" + \accepts "KievanVoice" + \description "Same as @code{Staff} context, except that it is +accommodated for typesetting a piece in Kievan style." + + \remove "Time_signature_engraver" + + %% Choose Kievan tsefaut clef + clefGlyph = #"clefs.kievan.do" + middleCClefPosition = #0 + middleCPosition = #0 + clefPosition = #0 + clefOctavation = #0 + + %% Accidentals are valid only once (if the following note is different) + extraNatural = ##f + autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0) + ,neo-modern-accidental-rule) + autoCautionaries = #'() + printKeyCancellation = ##f + +} + +%% Keep the old definitions in here for compatibility (they erase previous +%% settings to the corresponding context!). +%% For new scores, one should simply insert the \RemoveEmptyStaves settings +%% into the desired context. That's just as easy, requires only one line more +%% (the \*Staff), but preserves previous context mods. +%% TODO: DEPRECATED_2.13.17, remove at some point in the future +RemoveEmptyStaffContext = \context { + \Staff + \RemoveEmptyStaves +} + +AncientRemoveEmptyStaffContext = \context { + \VaticanaStaff + \RemoveEmptyStaves +} + +RemoveEmptyDrumStaffContext = \context { + \DrumStaff + \RemoveEmptyStaves +} + +RemoveEmptyRhythmicStaffContext = \context { \RhythmicStaff - \remove "Axis_group_engraver" - \override VerticalAxisGroup #'remove-empty = ##t - \consists "Hara_kiri_engraver" + \RemoveEmptyStaves +} + +RemoveEmptyTabStaffContext = \context { + \TabStaff + \RemoveEmptyStaves }