GLASGOW AND EDINBURGH: Mackintosh’s modernism