search

Super-Fluid / heqet

Organize Euterpea music for real instruments and create scores with Lilypond
GNU General Public License v3.0
3 stars 3 forks source link

lilypond output should be human readable, formatted well for git #92

Open Super-Fluid opened 8 years ago

Super-Fluid commented 8 years ago

or Heqet could have intelligent merge-conflict resolution. Like if two people edit a spreadsheet file, they probably will just both add more cells and functions, and the order that the two edits are made won't matter except perhaps the order that the new cells are present. There might also be multiple new tags or stuff with the same name, which could just be resolved by appending digits to them.

Super-Fluid commented 8 years ago

render to another intermediate structure, with staves, names. Fill these into a template... Problem: part might have different notes for transposition instrument and music in weird keys. Midi will also be a separate version. On the other hand, the score will be a transposed score...

Super-Fluid commented 8 years ago

merging: find additions, renumber so unique numbers (make sure to update refs)

Super-Fluid commented 8 years ago

merging: heqet --merge variations: --merge0 just pack two pieces of music into one file --merge1 combine, handling new leaves and, with a 3 way merge, changed parameters --merge2 combine all reasonable things, including changes to topology --merge3 combine everything, possibly to detrimental effect

--requiredp does the file need to be merged? --check will the specified merge succeed? --parse is the file well formatted, including merge conflicts (by itself, is it a correct heqet file)?