From dfd34393fcf4301c6fcd67d2533d60161b9be4b6 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 25 Oct 2010 22:50:20 +0200 Subject: [PATCH] Add a new "testing" theme, adn \dyncresc command. --- bin/text.scm | 22 ++++++++++++++++++++++ share/themes/default/layout.ily | 9 --------- share/themes/{default => testing}/layout.ily | 13 ------------- 3 files changed, 22 insertions(+), 22 deletions(-) copy share/themes/{default => testing}/layout.ily (75%) diff --git a/bin/text.scm b/bin/text.scm index d817c8e..321530b 100644 --- a/bin/text.scm +++ b/bin/text.scm @@ -34,6 +34,28 @@ (markup #:dynamic-string arg))) (else arg))))) +(define dyncresc + (define-music-function (parser location arg) (markup?) + (make-music 'CrescendoEvent 'span-direction START + 'span-type 'text + 'span-text (cond + ((string? arg) + (if (string-every char-set:dynamics arg) + arg + (markup #:dynamic-string arg))) + (else arg))))) + +(define dyndim + (define-music-function (parser location arg) (markup?) + (make-music 'DecrescendoEvent 'span-direction START + 'span-type 'text + 'span-text (cond + ((string? arg) + (if (string-every char-set:dynamics arg) + arg + (markup #:dynamic-string arg))) + (else arg))))) + (define startText (define-music-function (location parser txt) (markup?) (make-text-span txt))) diff --git a/share/themes/default/layout.ily b/share/themes/default/layout.ily index 50ddcc4..1e07060 100644 --- a/share/themes/default/layout.ily +++ b/share/themes/default/layout.ily @@ -34,13 +34,4 @@ autoCautionaries = #modern-cautionaries-style extraNatural = ##f } - \context { - \Voice - \override LaissezVibrerTie #'details = - #'((height-limit . 2.0) ; default 1 - (note-head-gap . -2.6) ; default 0.2 - (horizontal-distance-penalty-factor . 51)) % default 10 - \override LaissezVibrerTie #'extra-offset = - #'(2.5 . 0) % has to match note-head-gap. Sort of. - } } diff --git a/share/themes/default/layout.ily b/share/themes/testing/layout.ily similarity index 75% copy from share/themes/default/layout.ily copy to share/themes/testing/layout.ily index 50ddcc4..19e08bb 100644 --- a/share/themes/default/layout.ily +++ b/share/themes/testing/layout.ily @@ -22,19 +22,6 @@ \layout { \context { - \Score - subdivideBeams = ##t - \override TrillPitchAccidental #'avoid-slur = #'inside - \override TimeSignature #'style = #'() - \override SystemStartBracket #'collapse-height = #1 - %\override SystemStartBrace #'collapse-height = #1 - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - autoAccidentals = #modern-accidentals-style % see liblayout.scm - autoCautionaries = #modern-cautionaries-style - extraNatural = ##f - } - \context { \Voice \override LaissezVibrerTie #'details = #'((height-limit . 2.0) ; default 1 -- 2.11.4.GIT