Update regex for gap_mark post-processing to also handle gap_marks that are followed by digits.
Add 2 to gap_mark count for correct results.