Use R addition formulae (#897)

Use R addition formulae (#897)

These are derived from the compound angle formulae