Correctly highlight XML tags with full-stops in them. Fixes #28

Author: Rowan Lewis

lib/bitter/languages/xml.php

@@ -2,11 +2,11 @@
 /*------------------------------------------------------------------------------
 	Entities
 ------------------------------------------------------------------------------*/
-	
+
 	Bitter::rule(
 		Bitter::id('xml-entity'),
 		Bitter::capture('&(#|#x)?([a-z0-9]+)?;?'),
-		
+
 		Bitter::rule(
 			Bitter::id('xml-entity-valid'),
 			Bitter::tag('entity'),
@@ -18,15 +18,15 @@
 			Bitter::capture('.+')
 		)
 	);
-	
+
 /*------------------------------------------------------------------------------
 	Attributes
 ------------------------------------------------------------------------------*/
-	
+
 	Bitter::rule(
 		Bitter::id('xml-attribute'),
 		Bitter::capture('([a-z][a-z0-9_\-\:]*)(\s*=\s*)?(".*?"|\'.*?\')?', 'i'),
-		
+
 		Bitter::rule(
 			Bitter::id('xml-attribute-key'),
 			Bitter::tag('attribute'),
@@ -36,14 +36,14 @@
 			Bitter::id('xml-attribute-value-single'),
 			Bitter::tag('value'),
 			Bitter::capture("'.*?'$"),
-			
+
 			Bitter::id('xml-entity')
 		),
 		Bitter::rule(
 			Bitter::id('xml-attribute-value-double'),
 			Bitter::tag('value'),
 			Bitter::capture('".*?"$'),
-			
+
 			Bitter::id('xml-entity')
 		),
 		Bitter::rule(
@@ -52,11 +52,11 @@
 			Bitter::capture('.+')
 		)
 	);
-	
+
 /*------------------------------------------------------------------------------
 	Comments
 ------------------------------------------------------------------------------*/
-	
+
 	Bitter::rule(
 		Bitter::id('xml-doctype'),
 		Bitter::tag('doctype'),
@@ -67,7 +67,7 @@
 		Bitter::tag('comment'),
 		Bitter::start('<!--'),
 		Bitter::stop('-->?'),
-		
+
 		Bitter::rule(
 			Bitter::id('xml-comment-error'),
 			Bitter::tag('error'),
@@ -80,16 +80,16 @@
 		Bitter::start('<!\[CDATA\['),
 		Bitter::stop('\]\]>')
 	);
-	
+
 /*------------------------------------------------------------------------------
 	Declarations
 ------------------------------------------------------------------------------*/
-	
+
 	Bitter::rule(
 		Bitter::id('xml-declaration'),
 		Bitter::tag('declaration open close'),
 		Bitter::capture('<\?xml.*?(\??)>', 'i'),
-		
+
 		Bitter::rule(
 			Bitter::id('xml-declaration-begin'),
 			Bitter::tag('begin'),
@@ -100,67 +100,67 @@
 			Bitter::tag('end'),
 			Bitter::capture('[\?]>$')
 		),
-		
+
 		Bitter::id('xml-attribute')
 	);
-	
+
 /*------------------------------------------------------------------------------
 	Tags
 ------------------------------------------------------------------------------*/
-	
+
 	Bitter::rule(
 		Bitter::id('xml-tag-open'),
-		Bitter::capture('<[a-z][a-z0-9_\-\:]*(([^>]+)?)>', 'i'),
+		Bitter::capture('<[a-z][a-z0-9_\-\:.]*(([^>]+)?)>', 'i'),
 		Bitter::tag('tag open'),
-		
+
 		Bitter::rule(
 			Bitter::id('xml-tag-open-begin'),
-			Bitter::capture('^<[a-z][a-z0-9_\-\:]*', 'i'),
+			Bitter::capture('^<[a-z][a-z0-9_\-\:.]*', 'i'),
 			Bitter::tag('begin')
 		),
 		Bitter::rule(
 			Bitter::id('xml-tag-open-end'),
 			Bitter::capture('/>|>$'),
 			Bitter::tag('end')
 		),
-		
+
 		Bitter::id('xml-attribute')
 	);
 	Bitter::rule(
 		Bitter::id('xml-tag-close'),
 		Bitter::capture('</[^>]+>?'),
-		
+
 		Bitter::rule(
 			Bitter::id('xml-tag-close-valid'),
 			Bitter::tag('tag close'),
-			Bitter::capture('</[a-z][a-z0-9_\-\:]*>', 'i')
+			Bitter::capture('</[a-z][a-z0-9_\-\:.]*>', 'i')
 		),
 		Bitter::rule(
 			Bitter::id('xml-declaration-error'),
 			Bitter::tag('error'),
 			Bitter::capture('.+')
 		),
-		
+
 		Bitter::id('xml-attribute')
 	);
-	
+
 /*------------------------------------------------------------------------------
 	Main
 ------------------------------------------------------------------------------*/
-	
+
 	Bitter::rule(
 		Bitter::id('xml-text'),
 		Bitter::tag('text'),
 		Bitter::capture('[^<>]{1,}'),
-		
+
 		Bitter::id('xml-entity')
 	);
-	
+
 	Bitter::rule(
 		Bitter::id('xml-include'),
 		Bitter::tag('context-markup xml'),
 		Bitter::capture('.+', 's'),
-		
+
 		Bitter::id('xml-text'),
 		Bitter::id('xml-doctype'),
 		Bitter::id('xml-comment'),
@@ -169,12 +169,12 @@
 		Bitter::id('xml-tag-close'),
 		Bitter::id('xml-tag-open')
 	);
-	
+
 	Bitter::rule(
 		Bitter::id('xml'),
-		
+
 		Bitter::id('xml-include')
 	);
-	
+
 /*----------------------------------------------------------------------------*/
 ?>