If one tags words within a verse one will have to disolve sandh which destroys the meter and makes the text no longer metrical, i.e. no longer a verse.  For this reason, I do word tagging in a separate file from the file that has sandhi of the verse undisturbed and coordinate it with the verse file by identical xml:id elements.
Yours,
Peter

******************************
Peter M. Scharf, President
The Sanskrit Library
******************************