[Tkabber-dev] r1167 - in trunk/tkabber: . jabberlib-tclxml/tclxml

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Tue Jul 31 09:47:13 MSD 2007


Author: sergei
Date: 2007-07-31 09:47:12 +0400 (Tue, 31 Jul 2007)
New Revision: 1167

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/jabberlib-tclxml/tclxml/xml-8.1.tcl
Log:
	* jabberlib-tclxml/tclxml/xml-8.1.tcl: Fixed tokenizing regexp to
	  match CDATA XML declaration (this bug was introduced at
	  2005-04-07 when parsing unescaped > in tag attributes was fixed).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-07-26 19:55:37 UTC (rev 1166)
+++ trunk/tkabber/ChangeLog	2007-07-31 05:47:12 UTC (rev 1167)
@@ -1,3 +1,9 @@
+2007-07-31  Sergei Golovan  <sgolovan at nes.ru>
+
+	* jabberlib-tclxml/tclxml/xml-8.1.tcl: Fixed tokenizing regexp to
+	  match CDATA XML declaration (this bug was introduced at
+	  2005-04-07 when parsing unescaped > in tag attributes was fixed).
+
 2007-07-26  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/chat/logger.tcl: Added ~ to symbols which are escaped

Modified: trunk/tkabber/jabberlib-tclxml/tclxml/xml-8.1.tcl
===================================================================
--- trunk/tkabber/jabberlib-tclxml/tclxml/xml-8.1.tcl	2007-07-26 19:55:37 UTC (rev 1166)
+++ trunk/tkabber/jabberlib-tclxml/tclxml/xml-8.1.tcl	2007-07-31 05:47:12 UTC (rev 1167)
@@ -80,7 +80,7 @@
 
     # Expressions for pulling things apart
     #variable tokExpr <(/?)([::xml::cl ^$::xml::Wsp>/]+)([::xml::cl $::xml::Wsp]*[::xml::cl ^>]*)>
-    variable tokExpr {<(/?)([^\s>/]+)((\s*([^'\"\s]+\s*=\s*'[^']*'|[^'\"\s]+\s*=\s*\"[^\"]*\"))*\s*[?/]?)>}
+    variable tokExpr {<(/?)([^\s>/]+)((\s*([^'\"\s]+\s*=\s*'[^']*'|[^'\"\s]+\s*=\s*\"[^\"]*\")|[^>])*\s*[?/]?)>}
     variable substExpr "\}\n{\\2} {\\1} {\\3} \{"
 
 }



More information about the Tkabber-dev mailing list