X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=5ce305aa5cc8e9603bff4d88e4046a16f3b8bc93;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c8671b5ef79799351982dfd5996bfc1bc9459979;hpb=f66e6785e42f181199f6cf357434f60baba1e149;p=lilypond.git diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index c8671b5ef7..5ce305aa5c 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,6 +1,6 @@ %%%% This file is part of LilyPond, the GNU music typesetter. %%%% -%%%% Copyright (C) 1996--2012 Han-Wen Nienhuys +%%%% Copyright (C) 1996--2015 Han-Wen Nienhuys %%%% Jan Nieuwenhuizen %%%% %%%% LilyPond is free software: you can redistribute it and/or modify @@ -16,10 +16,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.14.0" - -%% < 1.8 compatibility switch -#(ly:set-option 'old-relative) +\version "2.19.22" %% named durations breve = #(ly:make-duration -1 0) @@ -31,7 +28,7 @@ maxima = #(ly:make-duration -3 0) %% default note names are dutch #(set! default-language "nederlands") -#(note-names-language parser default-language) +#(note-names-language default-language) \include "drumpitch-init.ly" \include "chord-modifiers-init.ly" @@ -41,6 +38,10 @@ maxima = #(ly:make-duration -3 0) #(define default-fret-table (make-hash-table 101)) #(define chord-shape-table (make-hash-table 29)) +#(call-after-session + (lambda () + (hash-clear! default-fret-table) + (hash-clear! chord-shape-table))) % declarations for standard directions left = #-1 @@ -54,10 +55,10 @@ bigger = #1 center = #0 %% FIXME -%% should also set \override Beam #'breakable, but how to do it "portably"? (ie. also +%% should also set \override Beam.breakable, but how to do it "portably"? (ie. also %% working with lyric sections) %% -%% try \once \override Score.Beam #'breakable = ##t +%% try \once \override Score.Beam.breakable = ##t %% rather name \newline, \pageBreak ? break = #(make-music 'LineBreakEvent 'break-permission 'force) @@ -73,17 +74,21 @@ startStaff = #(make-span-event 'StaffSpanEvent START) % Code articulation definitions % noBeam = #(make-music 'BeamForbidEvent) -pipeSymbol = #(make-music 'BarCheck) -bracketOpenSymbol = #(make-span-event 'BeamEvent START) -bracketCloseSymbol = #(make-span-event 'BeamEvent STOP) -tildeSymbol = #(make-music 'TieEvent) -parenthesisOpenSymbol = #(make-span-event 'SlurEvent START) -parenthesisCloseSymbol = #(make-span-event 'SlurEvent STOP) -escapedExclamationSymbol = #(make-span-event 'CrescendoEvent STOP) -escapedParenthesisOpenSymbol = #(make-span-event 'PhrasingSlurEvent START) -escapedParenthesisCloseSymbol = #(make-span-event 'PhrasingSlurEvent STOP) -escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START) -escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START) +"|" = #(make-music 'BarCheck) +"[" = #(make-span-event 'BeamEvent START) +"]" = #(make-span-event 'BeamEvent STOP) +"~" = #(make-music 'TieEvent) +"(" = #(make-span-event 'SlurEvent START) +")" = #(make-span-event 'SlurEvent STOP) +"\\!" = #(make-span-event 'CrescendoEvent STOP) +"\\(" = #(make-span-event 'PhrasingSlurEvent START) +"\\)" = #(make-span-event 'PhrasingSlurEvent STOP) +"\\>" = #(make-span-event 'DecrescendoEvent START) +"\\<" = #(make-span-event 'CrescendoEvent START) +"\\[" = #(make-span-event 'LigatureEvent START) +"\\]" = #(make-span-event 'LigatureEvent STOP) +"\\~" = #(make-music 'PesOrFlexaEvent) +"\\\\" = #(make-music 'VoiceSeparator) \include "scale-definitions-init.ly" @@ -99,6 +104,9 @@ repeatTie = #(make-music 'RepeatTieEvent) %% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter. #(define musicQuotes (make-hash-table 29)) +#(call-after-session + (lambda () + (hash-clear! musicQuotes))) #(define toplevel-book-handler print-book-with-defaults) #(define toplevel-bookpart-handler collect-bookpart-for-book) @@ -115,6 +123,7 @@ repeatTie = #(make-music 'RepeatTieEvent) #(define bookpart-text-handler ly:book-add-score!) #(define bookpart-music-handler collect-book-music-for-book) #(define output-def-music-handler context-defs-from-music) +#(define context-mod-music-handler context-mod-from-music) \include "predefined-fretboards-init.ly" \include "string-tunings-init.ly"