CVS commit by alund: support for multiline XML tags from Lawrence CCMAIL: lwithers@users.sf.net M +4 -4 kateautoindent.cpp 1.27 --- kdelibs/kate/part/kateautoindent.cpp #1.26:1.27 @@ -1018,8 +1018,8 @@ int KatePythonIndent::calcExtra (int &pr // BEGIN KateXmlIndent -QRegExp KateXmlIndent::openTag = QRegExp( "(<[^\?!/][^>]*[^/]>)|(<[^\?!/>]>)" ); -QRegExp KateXmlIndent::closeTag = QRegExp( "]*>" ); +QRegExp KateXmlIndent::openTag = QRegExp( "<[^\?!/]" ); +QRegExp KateXmlIndent::closeTag = QRegExp( "(]*>)|/>" ); QRegExp KateXmlIndent::startsWithCloseTag = QRegExp( "^[ \t]*]*[^/]>)|(<[^\?!/>]>)" ); +QRegExp KateXmlIndent::openOrCloseTag = QRegExp( "(<[^\?!/])|()" ); KateXmlIndent::KateXmlIndent (KateDocument *doc) @@ -1158,5 +1158,5 @@ void KateXmlIndent::findOpeningElemInden for(int pos2 = -1; pos2 != pos; ) { pos2 = openOrCloseTag.search(ln, pos2 + 1); - if(ln.at(pos2 + 1).unicode() == '/') { + if(ln.at(pos2 + 1).unicode() == '/' || ln.at(pos2).unicode() == '/') { if(numOpened) --numOpened; } else {