Merge branch 'main' of https://git.dijkewijk.nl/hans/lilypond-hd.git into HEAD

functions.ly

@@ -1,4 +1,4 @@
-\version "2.24.3"
+\version "2.25.3"
 \language "english"
 
 stripArticulations = #(define-scheme-function
@@ -176,3 +176,62 @@ tri = #(define-scheme-function
           \times 2/3 { $n1 $n2 $n3 }
         #}
         )
+
+triN = #(define-scheme-function
+         (n1 n2 n3)
+         (ly:music? ly:music? ly:music?)
+         #{
+            \tuplet 3/2 { \once \omit TupletNumber \once \omit TupletBracket $n1 $n2 $n3 }
+         #}
+         )
+
+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?)
+         #{
+             \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" } 
+                       }}

string-quartet.ly

@@ -28,6 +28,8 @@ 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 { 
@@ -38,7 +40,7 @@ makeScore = #(define-scheme-function
                   \layout { 
                     \context {
                       \Score
-                        \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
+                        \override SpacingSpanner.common-shortest-duration = #moment
                     }
                   }
                   \midi {
@@ -46,6 +48,7 @@ makeScore = #(define-scheme-function
                 }          
               #}
               )
+              )		
 
 makeScoreVI = #(define-scheme-function
                 (music)