From 4797000ca3a019a942f1fb96f691f23d803948bb Mon Sep 17 00:00:00 2001 From: Hans Dijkema Date: Mon, 26 Jan 2026 20:01:13 +0100 Subject: [PATCH] - --- functions.ly | 54 ++++++++++++++++++++++++++++++++++++++++++++++- string-quartet.ly | 9 +++++--- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/functions.ly b/functions.ly index c8b5fda..e05085b 100644 --- a/functions.ly +++ b/functions.ly @@ -175,4 +175,56 @@ tri = #(define-scheme-function #{ \times 2/3 { $n1 $n2 $n3 } #} - ) \ No newline at end of file + ) + +triG = #(define-scheme-function + (n1 n2 n3) + (ly:music? ly:music? ly:music?) + #{ + \times 2/3 { $n1[ $n2 $n3] } + #} + ) + +triGn = #(define-scheme-function + (n1 n2 n3) + (ly:music? ly:music? ly:music?) + #{ + %\omit TupletNumber { + \tuplet 3/2 { \once \omit TupletNumber $n1[ $n2 $n3] } + %} + #} + ) + + +markupBetween = #(define-scheme-function + (a b c) + (ly:music? ly:music? markup?) + #{ + \once \override Stem.X-extent = #'(1 . 5) $a ^$c $b + #} + ) + +turnBetween = #(define-scheme-function + (a b) + (ly:music? ly:music?) + #{ + \markupBetween $a $b \markup { \halign #-3 { \musicglyph #"scripts.turn" } } + #} + ) + +turnNaturalBetween = #(define-scheme-function + (a b) + (ly:music? ly:music?) + #{ + \markupBetween $a $b \markup { \halign #-3 \column { + { \musicglyph #"scripts.turn" } + \super { \musicglyph #"accidentals.natural" } + } + } + #} + ) + +turnNatural = ^\markup { \column { + { \musicglyph #"scripts.turn" } + \super { \musicglyph #"accidentals.natural" } + }} diff --git a/string-quartet.ly b/string-quartet.ly index 3a9ac53..2eb00e6 100644 --- a/string-quartet.ly +++ b/string-quartet.ly @@ -28,7 +28,9 @@ makeHdr = #(define-scheme-function makeScore = #(define-scheme-function (instrument midi music) (string? string? ly:music?) - #{ + (let ((moment (if (defined? 'sqCustomMoment) sqCustomMoment #(ly:make-moment 1/3)))) + (display "MOMENT=")(display moment)(newline) + #{ \score { \new Staff \with { instrumentName = $instrument @@ -38,14 +40,15 @@ makeScore = #(define-scheme-function \layout { \context { \Score - \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3) + \override SpacingSpanner.common-shortest-duration = #moment } } \midi { } } #} - ) + ) + ) makeScoreVI = #(define-scheme-function (music)