gtk-doc r669 - in trunk: . tests/gobject/src



Author: stefkost
Date: Wed Jan 28 12:14:11 2009
New Revision: 669
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=669&view=rev

Log:
	patch by: David NeÄas <yeti physics muni cz>
	* gtkdoc-mkdb.in:
	* tests/gobject/src/giface.c:
	* tests/gobject/src/gobject.c:
	  Abbreviation where not expanded at the start of text. Fixes #569339.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-mkdb.in
   trunk/tests/gobject/src/giface.c
   trunk/tests/gobject/src/gobject.c

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Wed Jan 28 12:14:11 2009
@@ -2346,18 +2346,18 @@
 
     # Convert '@param', but not '\ param'.
     #$text =~ s/\@(\w+((\.|->)\w+)*)/<parameter>$1<\/parameter>/g;
-    $text =~ s/([^\\])\@(\w+((\.|->)\w+)*)/$1<parameter>$2<\/parameter>/g;
+    $text =~ s/(\A|[^\\])\@(\w+((\.|->)\w+)*)/$1<parameter>$2<\/parameter>/g;
     $text =~ s/\\\@/\@/g;
 
     # Convert '%constant', but not '\%constant'.
     # Also allow negative numbers, e.g. %-1.
     #$text =~ s/\%(-?\w+)/&MakeXRef($1, &tagify($1, "literal"));/eg;
-    $text =~ s/([^\\])\%(-?\w+)/$1.&MakeXRef($2, &tagify($2, "literal"));/eg;
+    $text =~ s/(\A|[^\\])\%(-?\w+)/$1.&MakeXRef($2, &tagify($2, "literal"));/eg;
     $text =~ s/\\\%/\%/g;
 
     # Convert '#symbol', but not '\#symbol'.
     #$text =~ s/#([\w\-:]+)/&MakeHashXRef($1, "type");/eg;
-    $text =~ s/([^\\])#([\w\-:]+)/$1.&MakeHashXRef($2, "type");/eg;
+    $text =~ s/(\A|[^\\])#([\w\-:]+)/$1.&MakeHashXRef($2, "type");/eg;
     $text =~ s/\\#/#/g;
   }
 

Modified: trunk/tests/gobject/src/giface.c
==============================================================================
--- trunk/tests/gobject/src/giface.c	(original)
+++ trunk/tests/gobject/src/giface.c	Wed Jan 28 12:14:11 2009
@@ -1,6 +1,7 @@
 /**
  * SECTION:iface
  * @short_description: interface for gtk-doc unit test
+ * @see_also: #GtkdocObject
  *
  * This file contains non-sense code for the sole purpose of testing the docs.
  * We can link to the #GtkdocIface:itest property and the #GtkdocIface::itest

Modified: trunk/tests/gobject/src/gobject.c
==============================================================================
--- trunk/tests/gobject/src/gobject.c	(original)
+++ trunk/tests/gobject/src/gobject.c	Wed Jan 28 12:14:11 2009
@@ -1,6 +1,7 @@
 /**
  * SECTION:object
  * @short_description: class for gtk-doc unit test
+ * @see_also: #GtkdocIface
  *
  * This file contains non-sense code for the sole purpose of testing the docs.
  * We can link to the #GtkdocObject:otest property and the #GtkdocObject::otest



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]