Index: tags/image.tags
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/tags/image.tags,v
retrieving revision 1.11.4.1
diff -u -r1.11.4.1 image.tags
--- tags/image.tags	13 Feb 2007 23:18:35 -0000	1.11.4.1
+++ tags/image.tags	16 Feb 2007 13:02:06 -0000
@@ -6,25 +6,25 @@
 function reptag_image_init($context) {
   return $reptags['image'] = array(
     
-    "#{IMAGE:([0-9]*)x([0-9]*):(.*?)}#e"        => "'<img src=\'\\3\' alt=\'\' height=\'\\1\' width=\'\\2\' />'",  
+    "#{IMAGE:([0-9]*)x([0-9]*):(.*?)}#e"        => "'<img src=\'\\3\' alt=\'\' width=\'\\1\' height=\'\\2\' />'",  
     "#{IMAGE:(.*?)}#e"                          => "'<img src=\'\\1\' alt=\'\' />'",
     
-    "#{IMG:([0-9]*)x([0-9]*):(.*?)}#e"          => "'<img src=\'\\3\' alt=\'\' height=\'\\1\' width=\'\\2\' />'",
+    "#{IMG:([0-9]*)x([0-9]*):(.*?)}#e"          => "'<img src=\'\\3\' alt=\'\' width=\'\\1\' height=\'\\2\' />'",
     "#{IMG:(.*?)}#e"                            => "'<img src=\'\\1\' alt=\'\' />'",
     
-    "#{IMAGELEFT:([0-9]*)x([0-9]*):(.*?)}#e"    => "'<img src=\'\\3\' alt=\'\' height=\'\\1\' width=\'\\2\' align=\'left\' />'",
+    "#{IMAGELEFT:([0-9]*)x([0-9]*):(.*?)}#e"    => "'<img src=\'\\3\' alt=\'\' width=\'\\1\' height=\'\\2\' align=\'left\' />'",
     "#{IMAGELEFT:(.*?)}#e"                      => "'<img src=\'\\1\' alt=\'\' align=\'left\' />'",
-    "#{IMGLEFT:([0-9]*)x([0-9]*):(.*?)}#e"      => "'<img src=\'\\3\' alt=\'\' height=\'\\1\' width=\'\\2\' align=\'left\' />'",
+    "#{IMGLEFT:([0-9]*)x([0-9]*):(.*?)}#e"      => "'<img src=\'\\3\' alt=\'\' width=\'\\1\' height=\'\\2\' align=\'left\' />'",
     "#{IMGLEFT:(.*?)}#e"                        => "'<img src=\'\\1\' alt=\'\' align=\'left\' />'",
     
-    "#{IMAGERIGHT:([0-9]*)x([0-9]*):(.*?)}#e"   => "'<img src=\'\\3\' alt=\'\' height=\'\\1\' width=\'\\2\' align=\'right\' />'",
+    "#{IMAGERIGHT:([0-9]*)x([0-9]*):(.*?)}#e"   => "'<img src=\'\\3\' alt=\'\' width=\'\\1\' height=\'\\2\' align=\'right\' />'",
     "#{IMAGERIGHT:(.*?)}#e"                     => "'<img src=\'\\1\' alt=\'\' align=\'right\' />'",
-    "#{IMGRIGHT:([0-9]*)x([0-9]*):(.*?)}#e"     => "'<img src=\'\\3\' alt=\'\' height=\'\\1\' width=\'\\2\' align=\'right\' />'",
+    "#{IMGRIGHT:([0-9]*)x([0-9]*):(.*?)}#e"     => "'<img src=\'\\3\' alt=\'\' width=\'\\1\' height=\'\\2\' align=\'right\' />'",
     "#{IMGRIGHT:(.*?)}#e"                       => "'<img src=\'\\1\' alt=\'\' align=\'right\' />'",
   
-    "#{SPACER:(.*?)x(.*?)}#e"                   => "'<img src=\"'.reptag_image_spacer('\\1', '\\2').'\" height=\'\\1\' width=\'\\2\' alt=\'\' />'",
-    "#{SPACERLEFT:(.*?)x(.*?)}#e"               => "'<img src=\"'.reptag_image_spacer('\\1', '\\2').'\" height=\'\\1\' width=\'\\2\' alt=\'\' align=\'left\' />'",
-    "#{SPACERRIGHT:(.*?)x(.*?)}#e"              => "'<img src=\"'.reptag_image_spacer('\\1', '\\2').'\" height=\'\\1\' width=\'\\2\' alt=\'\' align=\'right\' />'"
+    "#{SPACER:(.*?)x(.*?)}#e"                   => "'<img src=\"'.reptag_image_spacer('\\1', '\\2').'\" width=\'\\1\' height=\'\\2\' alt=\'\' />'",
+    "#{SPACERLEFT:(.*?)x(.*?)}#e"               => "'<img src=\"'.reptag_image_spacer('\\1', '\\2').'\" width=\'\\1\' height=\'\\2\' alt=\'\' align=\'left\' />'",
+    "#{SPACERRIGHT:(.*?)x(.*?)}#e"              => "'<img src=\"'.reptag_image_spacer('\\1', '\\2').'\" width=\'\\1\' height=\'\\2\' alt=\'\' align=\'right\' />'"
     
   );
 }
@@ -32,29 +32,29 @@
 $reptags_info['image'] = array(t('Images (IMG, IMGLEFT, SPACER, ...)'), TRUE);
 $reptags_help['image'] = array(
   
-  "{IMAGE:50x50:path/to/sample.png}"        => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' height='50' width='50' />text",
+  "{IMAGE:50x40:path/to/sample.png}"        => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' width='50' height='40' />text",
   "{IMAGE:path/to/sample.png}"              => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' />text",
   
-  "{IMG:50x50:path/to/sample.png}"          => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' height='50' width='50' />text",
+  "{IMG:50x40:path/to/sample.png}"          => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' width='50' height='40' />text",
   "{IMG:path/to/sample.png}"                => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' />text",
   
-  "{IMAGELEFT:50x50:path/to/sample.png}"    => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' height='50' width='50' align='left' />text",
+  "{IMAGELEFT:50x40:path/to/sample.png}"    => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' width='50' height='40' align='left' />text",
   "{IMAGELEFT:path/to/sample.png}"          => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' align='left' />text",
-  "{IMGLEFT:50x50:path/to/sample.png}"      => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' height='50' width='50' align='left' />text",
+  "{IMGLEFT:50x40:path/to/sample.png}"      => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' width='50' height='40' align='left' />text",
   "{IMGLEFT:path/to/sample.png}"            => "<img src='".$reptag_image_basepath."/tags/sample.png' alt='' align='left' />text",
   
-  "{IMAGERIGHT:50x50:path/to/sample.png}"   => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' height='50' width='50' align='right' />",
+  "{IMAGERIGHT:50x40:path/to/sample.png}"   => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' width='50' height='40' align='right' />",
   "{IMAGERIGHT:path/to/sample.png}"         => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' align='right' />",
-  "{IMGRIGHT:50x50:path/to/sample.png}"     => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' height='50' width='50' align='right' />",
+  "{IMGRIGHT:50x40:path/to/sample.png}"     => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' width='50' height='40' align='right' />",
   "{IMGRIGHT:path/to/sample.png}"           => "text<img src='".$reptag_image_basepath."/tags/sample.png' alt='' align='right' />",
 
-  "{SPACER:20x100}"                         => "text<img src='".reptag_image_spacer(20, 100)."' height=\'20\' width=\'100\' alt='' />text",
-  "{SPACERLEFT:10x100}"                     => "<img src='".reptag_image_spacer(10, 100)."' height=\'10\' width=\'100\' alt='' align='left' />text",
-  "{SPACERRIGHT:10x100}"                    => "<img src='".reptag_image_spacer(10, 100)."' height=\'10\' width=\'100\' alt='' align='right' />text"
+  "{SPACER:100x20}"                         => "text<img src='".reptag_image_spacer(100, 20)."' width=\'100\' height=\'20\' alt='' />text",
+  "{SPACERLEFT:100x10}"                     => "<img src='".reptag_image_spacer(100, 10)."' width=\'100\' height=\'10\' alt='' align='left' />text",
+  "{SPACERRIGHT:100x10}"                    => "<img src='".reptag_image_spacer(100, 10)."' width=\'100\' height=\'10\' alt='' align='right' />text"
   
 );
 
-function reptag_image_spacer($height, $width) {
+function reptag_image_spacer($width, $height) {
   if (function_exists('imagegif')) {
     $img = imagecreate($width, $height);
     $bkg = imagecolorallocate($img, 0, 255, 255);