Index: pango/pango-markup.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-markup.c,v
retrieving revision 1.25
diff -u -r1.25 pango-markup.c
--- pango/pango-markup.c	17 Nov 2005 04:56:14 -0000	1.25
+++ pango/pango-markup.c	21 Dec 2005 06:35:51 -0000
@@ -468,8 +468,28 @@
                   /* set next range_start, skipping accel marker */
                   range_start = g_utf8_next_char (p);
                 }
-              else
-                {
+              else 
+		{
+		  gunichar c2, c3;
+		  gchar *r;
+
+		  r = g_utf8_next_char (p);
+		  c2 = g_utf8_get_char (r);
+		  if (c2)
+		    {
+		      r = g_utf8_next_char (r);
+		      c3 = g_utf8_get_char (r);
+		    }
+		  else
+		    c3 = 0; 
+
+		  if (c == '[' && c3 == ']')
+		    {
+		      /* found _[f] */
+		      c = c2;
+		      p = g_utf8_next_char (r);
+		    }
+		  
                   /* Don't append the accel marker (leave range_end
                    * alone); set the accel char to c; record location for
                    * underline attribute
