I use format 2 and do it differently as well.
N1840(Clockwise tap operation - M14)
N1841G90
N1842M09
N1843T21 M6
N1844G1 X-0.87 Y0. S140. M3 F1.
N1845Z8.8 H21 F88.
N1846G0 X-0.87 Y0.
N1847G84.2
N1848z8.6
N1849G84.1 R8.55 Z7.2 F11.024 S140.
N1850G80
N1851G0 Z9.8
N1852(Rotate Table)
I have always started the spindle even though Fadal says don't do it. Originally it was because I didn't know any better and now it is mostly because I keep forgetting to modify my post processor.
I always use the G84.2 and output the F to match the pitch instead of using Q
So far in this thread we all do it and no two of us have the same code yet
www.integratedmechanical.ca