rework macros in orchesra ; needs to be done for score as well
Merge branch 'develop' of github.com:csound/csound into develop