gtk-doc r563 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Mon May  5 12:18:53 2008
New Revision: 563
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=563&view=rev

Log:
	* gtkdoc-mkdb.in:
	  Fix regexps changes from previous commit. When using /e the
	  replacement part has to be a perl snippet.



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

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Mon May  5 12:18:53 2008
@@ -2000,23 +2000,24 @@
     # We are outside any CDATA or <programlisting> sections, so we expand
     # any gtk-doc abbreviations.
 
-    # Convert 'function()' or 'macro()'
+    # Convert 'function()' or 'macro()'.
     $text =~ s/(\w+)\s*\(\)/&MakeXRef($1, &tagify($1 . "()", "function"));/eg;
 
-    # Convert '@param'
+    # Convert '@param', but not '\ param'.
     #$text =~ s/\@(\w+((\.|->)\w+)*)/<parameter>$1<\/parameter>/g;
-    $text =~ s/[^\\]\@(\w+((\.|->)\w+)*)/<parameter>$1<\/parameter>/g;
-    $text =~ s/\\\@(\w+((\.|->)\w+)*)/\ $1/g;
+    $text =~ s/([^\\])\@(\w+((\.|->)\w+)*)/$1<parameter>$2<\/parameter>/g;
+    $text =~ s/\\\@/\@/g;
 
-    # Convert '%constant'. Also allow negative numbers, e.g. %-1.
+    # Convert '%constant', but not '\%constant'.
+    # Also allow negative numbers, e.g. %-1.
     #$text =~ s/\%(-?\w+)/&MakeXRef($1, &tagify($1, "literal"));/eg;
-    $text =~ s/[^\\]\%(-?\w+)/&MakeXRef($1, &tagify($1, "literal"));/eg;
-    $text =~ s/\\\%(-?\w+)/\%$1/g;
+    $text =~ s/([^\\])\%(-?\w+)/$1.&MakeXRef($2, &tagify($2, "literal"));/eg;
+    $text =~ s/\\\%/\%/g;
 
-    # Convert '#symbol'
+    # Convert '#symbol', but not '\#symbol'.
     #$text =~ s/#([\w\-:]+)/&MakeHashXRef($1, "type");/eg;
-    $text =~ s/[^\\]#([\w\-:]+)/&MakeHashXRef($1, "type");/eg;
-    $text =~ s/\\#([\w\-:]+)/#$1/g;
+    $text =~ s/([^\\])#([\w\-:]+)/$1.&MakeHashXRef($2, "type");/eg;
+    $text =~ s/\\#/#/g;
   }
 
   return $text;