X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=47af14b0239aa174a9c4abca4ef305f25b5e28fc;hb=89b7e75f6888d2020f7fe8b258e818c0c5e7a223;hp=47dfba728c05d06b48f50b34a0327bfa1d1f30cd;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 47dfba728c..47af14b023 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -16,7 +16,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.15.20" +\version "2.16.0" \context { \name "Global" @@ -26,11 +26,13 @@ \defaultchild "Score" \description "Hard coded entry point for LilyPond. Cannot be tuned." \grobdescriptions #all-grob-descriptions + EventClasses = #all-event-classes } \context { \type "Engraver_group" \name "FretBoards" + \alias "Staff" \description "A context for displaying fret diagrams." \consists "Fretboard_engraver" @@ -46,6 +48,7 @@ predefinedDiagramTable = #default-fret-table handleNegativeFrets = #'recalculate + restrainOpenStrings = ##f } \context { @@ -82,6 +85,7 @@ \consists "Figured_bass_position_engraver" \consists "Script_row_engraver" \consists "Cue_clef_engraver" + \consists "Footnote_engraver" localKeySignature = #'() createSpacing = ##t @@ -228,7 +232,6 @@ 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. @@ -257,6 +260,7 @@ multiple voices on the same staff." \consists "Script_engraver" \consists "Script_column_engraver" + \consists "Fingering_column_engraver" \consists "Rhythmic_column_engraver" \consists "Note_spacing_engraver" \consists "Spanner_break_forbid_engraver" @@ -433,6 +437,7 @@ printing of a single line of lyrics." \consists "Lyric_engraver" \consists "Extender_engraver" \consists "Hyphen_engraver" + \consists "Tweak_engraver" \consists "Stanza_number_engraver" \consists "Instrument_name_engraver" \consists "Font_size_engraver" @@ -527,7 +532,14 @@ automatically when an output definition (a @code{\score} or \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" @@ -546,6 +558,7 @@ automatically when an output definition (a @code{\score} or \consists "Parenthesis_engraver" \consists "Concurrent_hairpin_engraver" \consists "Beam_collision_engraver" + \consists "Footnote_engraver" \defaultchild "Staff" @@ -559,6 +572,7 @@ automatically when an output definition (a @code{\score} or \accepts "PetrucciStaff" \accepts "StaffGroup" \accepts "DrumStaff" + \accepts "KievanStaff" \accepts "Lyrics" \accepts "ChordNames" \accepts "GrandStaff" @@ -568,7 +582,6 @@ automatically when an output definition (a @code{\score} or \accepts "NoteNames" \accepts "FiguredBass" - noteToFretFunction = #determine-frets predefinedDiagramTable = ##f soloText = #"Solo" @@ -593,6 +606,8 @@ automatically when an output definition (a @code{\score} or defaultBarType = #"|" doubleRepeatType = #":|:" + startRepeatType = #"|:" + endRepeatType = #":|" barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers barNumberFormatter = #robust-bar-number-function automaticBars = ##t @@ -605,7 +620,7 @@ automatically when an output definition (a @code{\score} or repeatCountVisibility = #all-repeat-counts-visible timeSignatureSettings = #default-time-signature-settings - timeSignatureFraction = #'(4 . 4) + timeSignatureFraction = 4/4 %% These defaults should be the same as the rules established in %% scm/time-signature-settings.scm for 4/4 time @@ -614,6 +629,8 @@ automatically when an output definition (a @code{\score} or beatStructure = #'(1 1 1 1) beamExceptions = #'((end . (((1 . 8) . (4 4)) ((1 . 12) . (3 3 3 3))))) + beamHalfMeasure = ##t + autoBeaming = ##t autoBeamCheck = #default-auto-beam-check @@ -779,6 +796,7 @@ context." \remove "Note_heads_engraver" \remove "Fingering_engraver" \remove "New_fingering_engraver" + \remove "Pitched_trill_engraver" \description "Context for drawing notes in a Tab staff." @@ -808,8 +826,8 @@ context." (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 #'transparent = ##t - \override Flag #'transparent = ##t + \override Stem #'stencil = ##f + \override Flag #'stencil = ##f %% automatic beams should be suppressed for similar reasons ... autoBeaming = ##f %% remove beams, dots and rests ... @@ -818,8 +836,8 @@ context." \override Dots #'stencil = ##f \override Rest #'stencil = ##f \override MultiMeasureRest #'stencil = ##f - \override MultiMeasureRestNumber #'transparent = ##t - \override MultiMeasureRestText #'transparent = ##t + \override MultiMeasureRestNumber #'stencil = ##f + \override MultiMeasureRestText #'stencil = ##f %% ... all kinds of ties/slurs \override Tie #'stencil = ##f \override RepeatTie #'stencil = ##f @@ -832,10 +850,10 @@ context." %% ... 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 @@ -888,6 +906,8 @@ contexts and handles the line spacing, the tablature clef etc. properly." clefPosition = #0 %% Change string if note results in negative fret number handleNegativeFrets = #'recalculate + %% Allow open strings even if minimumFret is set + restrainOpenStrings = ##f } \context { @@ -1113,6 +1133,52 @@ accommodated for typesetting a piece in Petrucci style." 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 +} + +\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