Is this the Pitlochry Theatre production to run from June- - October this year? It has been dramatised by Annie Downie. Previously run of sell-out performances at Perth Theatre in 2004. You might get info from this source, or try Pete Shepheard at Springthyme Music to find out about the other song.
"Yellow on the Broom" is of course the autobiography of Betsy Whyte, first published 1979, so Adam McNaughtan's song would probably be of this era, though the tune is one of those used for "The Female Drummer" (as sung by Peter Bellamy and others).