Reversed order of <T Q> and <2 \d{1,2}> tags to eliminate overlap, make edF.txt easier to parse, and eventually to convert it to XML.