X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fabc2ly.py;h=e6e0d12407e4ed53006ee529da85f55f7ac7dbab;hb=HEAD;hp=77d47d7dcdbd453f41d3fa47d9f784e752ff13d7;hpb=f0fe9c843e926066299c1f9a33004649f42e1f24;p=lilypond.git diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 77d47d7dcd..e6e0d12407 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -761,8 +761,12 @@ def try_parse_header_line (ln, state): lyrics_append(a) if g == 'w': # vocals slyrics_append (a) - if g == 'Q': #tempo + if g == 'Q': # tempo try_parse_q (a) + if g == 'R': # Rhythm (e.g. jig, reel, hornpipe) + header['meter'] = a + if g == 'Z': # Transcription (e.g. Steve Mansfield 1/2/2000) + header['transcription'] = a return '' return ln @@ -1203,6 +1207,9 @@ def try_parse_bar (str,state): clear_bar_acc(state) close_beam_state(state) + if str[:1] == '}': + close_beam_state(state) + if bs <> None or state.next_bar != '': if state.parsing_tuplet: state.parsing_tuplet =0