(den (if denominator denominator (ly:event-property ev 'denominator)))
(num (if numerator numerator (ly:event-property ev 'numerator))))
(format "~a:~a" den num)))
-"""
+""",
+ "compound-time-signature": """%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Formatting of (possibly complex) compound time signatures
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+#(define-public (insert-markups l m)
+ (let* ((ll (reverse l)))
+ (let join-markups ((markups (list (car ll)))
+ (remaining (cdr ll)))
+ (if (pair? remaining)
+ (join-markups (cons (car remaining) (cons m markups)) (cdr remaining))
+ markups))))
+
+% Use a centered-column inside a left-column, because the centered column
+% moves its reference point to the center, which the left-column undoes.
+% The center-column also aligns its contented centered, which is not undone...
+#(define-public (format-time-fraction time-sig-fraction)
+ (let* ((revargs (reverse (map number->string time-sig-fraction)))
+ (den (car revargs))
+ (nums (reverse (cdr revargs))))
+ (make-override-markup '(baseline-skip . 0)
+ (make-number-markup
+ (make-left-column-markup (list
+ (make-center-column-markup (list
+ (make-line-markup (insert-markups nums "+"))
+ den))))))))
+
+#(define-public (format-complex-compound-time time-sig)
+ (let* ((sigs (map format-time-fraction time-sig)))
+ (make-override-markup '(baseline-skip . 0)
+ (make-number-markup
+ (make-line-markup
+ (insert-markups sigs (make-vcenter-markup "+")))))))
+
+#(define-public (format-compound-time time-sig)
+ (cond
+ ((not (pair? time-sig)) (null-markup))
+ ((pair? (car time-sig)) (format-complex-compound-time time-sig))
+ (else (format-time-fraction time-sig))))
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Measure length calculation of (possibly complex) compound time signatures
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+#(define-public (calculate-time-fraction time-sig-fraction)
+ (let* ((revargs (reverse time-sig-fraction))
+ (den (car revargs))
+ (nums (cdr revargs)))
+ (ly:make-moment (apply + nums) den)))
+
+#(define-public (calculate-complex-compound-time time-sig)
+ (let* ((sigs (map calculate-time-fraction time-sig)))
+ (let add-moment ((moment ZERO-MOMENT)
+ (remaining sigs))
+ (if (pair? remaining)
+ (add-moment (ly:moment-add moment (car remaining)) (cdr remaining))
+ moment))))
+
+#(define-public (calculate-compound-measure-length time-sig)
+ (cond
+ ((not (pair? time-sig)) (ly:make-moment 4 4))
+ ((pair? (car time-sig)) (calculate-complex-compound-time time-sig))
+ (else (calculate-time-fraction time-sig))))
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Base beat lenth
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+#(define-public (calculate-compound-base-beat-full time-sig)
+ (let* ((den (map last time-sig)))
+ (apply max den)))
+
+#(define-public (calculate-compound-base-beat time-sig)
+ (ly:make-moment 1 (cond
+ ((not (pair? time-sig)) 4)
+ ((pair? (car time-sig)) (calculate-compound-base-beat-full time-sig))
+ (else (calculate-compound-base-beat-full (list time-sig))))))
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The music function to set the complex time signature
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+compoundMeter =
+#(define-music-function (parser location args) (pair?)
+ (let ((mlen (calculate-compound-measure-length args))
+ (beat (calculate-compound-base-beat args)))
+ #{
+\once \override Staff.TimeSignature #'stencil = #ly:text-interface::print
+\once \override Staff.TimeSignature #'text = #(format-compound-time $args)
+% \set Staff.beatGrouping = #(reverse (cdr (reverse $args)))
+\set Timing.measureLength = $mlen
+\set Timing.timeSignatureFraction = #(cons (ly:moment-main-numerator $mlen)
+ (ly:moment-main-denominator $mlen))
+\set Timing.beatLength = $beat
+
+% TODO: Implement beatGrouping and auto-beam-settings!!!
+#} ))
+"""
}
def round_to_two_digits (val):
tsm.element = seq
new_list.append (tsm)
+ #TODO: Handle nested tuplets!!!!
new_list.extend (music_list[last:])
return new_list
return None
change = musicexp.TimeSignatureChange()
change.fractions = sig
+ if (len(sig) != 2) or isinstance (sig[0], list):
+ needed_additional_definitions.append ("compound-time-signature")
time_elm = attributes.get_maybe_exist_named_child ('time')
if time_elm and hasattr (time_elm, 'symbol'):
def musicxml_lyrics_to_text (lyrics):
# TODO: Implement text styles for lyrics syllables
continued = False
+ extended = False
text = ''
for e in lyrics.get_all_children ():
if isinstance (e, musicxml.Syllabic):
if text:
text += " "
continued = False
+ extended = False
+ elif isinstance (e, musicxml.Extend):
+ if text:
+ text += " "
+ extended = True
if text == "-" and continued:
return "--"
- elif text == "_" and continued:
+ elif text == "_" and extended:
return "__"
elif continued and text:
return musicxml.escape_ly_output_string (text) + " --"
elif continued:
return "--"
+ elif extended and text:
+ return musicxml.escape_ly_output_string (text) + " __"
+ elif extended:
+ return "__"
elif text:
return musicxml.escape_ly_output_string (text)
else:
dest = 'output_name',
help = _ ("set output filename to FILE, stdout if -"))
p.add_option_group ('',
- description = (_ ("Report bugs via")
- + ''' http://post.gmane.org/post.php'''
- '''?group=gmane.comp.gnu.lilypond.bugs\n'''))
+ description = (
+ _ ("Report bugs via %s")
+ % 'http://post.gmane.org/post.php'
+ '?group=gmane.comp.gnu.lilypond.bugs') + '\n')
return p
def music_xml_voice_name_to_lily_name (part_id, name):