re-rounding rights

I can't see that the fact that the boat was correcting its course has any bearing. If you are taking a penalty or OCS at the start then you have obligations, but the fact that your course may not be the quickest way round doesn't change anyone's obligations under the normal rules.

Edited by PeterG - 21 Sep 15 at 8:31pm

Assuming this is the left hand gate mark to be rounded to port.

If One initially passed within 3 lengths of the mark and became entitled to mark room under rule 18.2 ( b ), when she tacked onto stbd to get back to the mark, rule 18 ceased to apply (boats on opposite tacks, rule 18.1 ( b )).

As One reaches/runs back towards the mark on stbd, it's simple port/stbd rule 10 and Two is required to keep clear.

When One gybes back onto port, both boats are on the same tack, at least one of them in the zone, so rule 18 once again applies, not 18.2 ( b ), but 18.2 ( a ), and whichever boat is inside, between the mark and the other boat is entitled to mark room.

If One was attempting to pass between Two and the mark, that suggests that One was the inside boat, particularly if th contact was Two's bow to One's stbd side, so, when she gybed, One went from stbd right of way to windward keep clear,but entitled to mark room.

So while One was returning on stbd, Two was required to keep clear, and when One gybed, Two was required to give her mark room.

This is unlike the situation of an OCS boat returning, which is required to keep clear under rule 22.1