As ctbuchanan already suggested much earlier in this thread, pinning of the tartan is appropriate once wedding vows have been exchanged.
I am not aware of any tradition involving a sword at a Scottish wedding.
Regional Director for Scotland for Clan Cunningham International, and a Scottish Armiger.