Yes, that's it! I mean John Riddell's Collection, 2nd edition, which is available from Highland Music Trust. I may very well have seen it before in Aird, as I got Jack's rendition of the Aird Selection books from his site ages ago. If you haven't seen what's available on Jack's web site you must: it's a treasure trove.

Regarding Wha Saw the 42nd?, there are a few tunes strongly related, Highland Donald Kissed Kitty, Will Ye Go and Marry Ketty, and Wha Wadna Fecht for Charlie? for example. An early printing was Stewart's Collection of 1761.