Added DTrigger declaration form.
Fixed missing span on new trigger parser.
Merged dtrigger branch