Merge pull request #142 from nickgashkov/fix/vmerge-w-t-attributes

Fix vertical merge tag for table cells with XML attributes

docxtpl/__init__.py

@@ -103,7 +103,7 @@ class DocxTemplate(object):
                     m1.group(4)  # ``</w:t>``.
                 )
             return re.sub(
-                r'(</w:tcPr>.*?<w:t>)(.*?)(?:{%\s*vm\s*%})(.*?)(</w:t>)',
+                r'(</w:tcPr[ >].*?<w:t(?:.*?)>)(.*?)(?:{%\s*vm\s*%})(.*?)(</w:t>)',
                 vMerge,
                 m.group(),  # Everything between ``</w:tc>`` and ``</w:tc>`` with ``{% vm %}`` inside.
                 flags=re.DOTALL,