gtk-doc r651 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Wed Jan 21 07:53:45 2009
New Revision: 651
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=651&view=rev

Log:
	* gtkdoc-fixxref.in:
	  Try to xref first word in 'normal' span.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-fixxref.in

Modified: trunk/gtkdoc-fixxref.in
==============================================================================
--- trunk/gtkdoc-fixxref.in	(original)
+++ trunk/gtkdoc-fixxref.in	Wed Jan 21 07:53:45 2009
@@ -242,7 +242,7 @@
     # now we could turn them into GTKDOCLINK items
     $entire_file =~ s%(<span class=\"function\">)(.*?)(</span>)%&MakeGtkDocLink($1,$2,$3);%gse;
     # we could also try the first item in stuff marked up as 'normal'
-    #$entire_file =~ s%(<span class=\"normal\">\s*)(.*?)(\s*.*?</span>)%&MakeGtkDocLink($1,$2,$3);%gse;
+    $entire_file =~ s%(<span class=\"normal\">\s*)(.+?)((\s+.+?)?\s*</span>)%&MakeGtkDocLink($1,$2,$3);%gse;
 
     $entire_file =~ s%<GTKDOCLINK\s+HREF="([^"]*)"\s*>(.*?)</GTKDOCLINK\s*>% &MakeXRef($1,$2); %gse;
 
@@ -277,6 +277,7 @@
     }
 }
 
+
 sub MakeGtkDocLink {
     my ($pre,$symbol,$post) = @_;
     
@@ -286,6 +287,7 @@
     return "$pre<GTKDOCLINK HREF=\"$id\">$symbol</GTKDOCLINK>$post";
 }
 
+
 sub HighlightSource {
     my ($type, $source) = @_;
 
@@ -320,6 +322,7 @@
     return "<div class=\"$type\"><pre class=\"programlisting\">$highlighted_source</pre></div>";
 }
 
+
 #############################################################################
 # Function    : CreateValidSGMLID
 # Description : Creates a valid SGML 'id' from the given string.