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

functions.ly

@@ -1,4 +1,5 @@
-
+\version "2.25.3"
+\language "english"
 
 stripArticulations = #(define-scheme-function
                        (music)
@@ -174,4 +175,63 @@ 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

@@ -1,3 +1,5 @@
+\version "2.24.3"
+\language "english"
 
 
 makePiece = #(define-scheme-function
@@ -24,44 +26,52 @@ makeHdr = #(define-scheme-function
             )
             
 makeScore = #(define-scheme-function
-              (instrument music)
+              (instrument midi music)
-              (string? ly: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 }
+                  \new Staff \with { 
+                    instrumentName = $instrument 
+                    midiInstrument = $midi
+                  }
                   $music
                   \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)
                 (ly:music?)
-                (makeScore "Violin I" music)
+                (makeScore "Violin I" "violin" music)
                 )
 
 makeScoreVII = #(define-scheme-function
                  (music)
                  (ly:music?)
-                 (makeScore "Violin II" music)
+                 (makeScore "Violin II" "violin" music)
                  )
 
 makeScoreVa = #(define-scheme-function
                 (music)
                 (ly:music?)
-                (makeScore "Viola" #{ { \clef alto $music } #})
+                (makeScore "Viola" "viola" #{ { \clef alto $music } #})
                 )
 
 makeScoreCl = #(define-scheme-function
                 (music)
                 (ly:music?)
-                (makeScore "Cello" #{ { \clef bass $music } #})
+                (makeScore "Cello" "cello" #{ { \clef bass $music } #})
                 )
 
 makeScoreFull = #(define-scheme-function
@@ -70,10 +80,22 @@ makeScoreFull = #(define-scheme-function
                   #{
                     \score {
                       << 
-                        \new Staff \with { instrumentName = "Violin I" } $vI
+                        \new Staff \with { 
-                        \new Staff \with { instrumentName = "Violin II" } $vII
+                          instrumentName = "Violin I" 
-                        \new Staff \with { instrumentName = "Viola" } { \clef alto $va }
+                          midiInstrument = "violin"
-                        \new Staff \with { instrumentName = "Cello" } { \clef bass $va }
+                        } $vI
+                        \new Staff \with { 
+                          instrumentName = "Violin II" 
+                          midiInstrument = "violin"
+                        } $vII
+                        \new Staff \with { 
+                          instrumentName = "Viola" 
+                          midiInstrument = "viola"
+                        } { \clef alto $va }
+                        \new Staff \with { 
+                          instrumentName = "Cello" 
+                          midiInstrument = "cello"
+                        } { \clef bass $cl }
                       >>
                       \layout { 
                         \context {
@@ -81,6 +103,8 @@ makeScoreFull = #(define-scheme-function
                             \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/3)
                         }
                       }
+                      \midi {
+                      }
                     }          
                   #}
                   )