gtk-doc r701 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Wed Mar 11 22:41:10 2009
New Revision: 701
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=701&view=rev

Log:
	* gtkdoc-mkdb.in:
	  Do not overwrite declaration variable with sgml-ified variant to not confuse
	  further parsing.



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

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Wed Mar 11 22:41:10 2009
@@ -1222,8 +1222,8 @@
     # g_assert.
     if (!defined ($DeclarationConditional{$symbol}) && ($symbol !~ m/^g_/)
 	&& ($symbol !~ m/^_?gnome_/) && (($declaration =~ tr/\n//) < 2)) {
-	$declaration = &CreateValidSGML ($declaration);
-	$desc .= "<programlisting>$declaration</programlisting>\n";
+	my $decl_out = &CreateValidSGML ($declaration);
+	$desc .= "<programlisting>$decl_out</programlisting>\n";
     } else {
 	$desc .= "<programlisting>" . &MakeReturnField("#define") . "$symbol";
 	# Align each line so that if should all line up OK.
@@ -1279,8 +1279,8 @@
     $desc .= OutputSymbolExtraLinks($symbol);
 
     if (!defined ($DeclarationConditional{$symbol})) {
-	$declaration = &CreateValidSGML ($declaration);
-	$desc .= "<programlisting>$declaration</programlisting>\n";
+	my $decl_out = &CreateValidSGML ($declaration);
+	$desc .= "<programlisting>$decl_out</programlisting>\n";
     }
 
     $desc .= &MakeDeprecationNote($symbol);
@@ -1485,8 +1485,8 @@
     $desc .= "\n";
     $desc .= OutputSymbolExtraLinks($symbol);
 
-    $declaration = &CreateValidSGML ($declaration);
-    $desc .= "<programlisting>$declaration</programlisting>\n";
+    my $decl_out = &CreateValidSGML ($declaration);
+    $desc .= "<programlisting>$decl_out</programlisting>\n";
 
     $desc .= &MakeDeprecationNote($symbol);
 
@@ -1559,8 +1559,8 @@
     $desc .= "\n";
     $desc .= OutputSymbolExtraLinks($symbol);
 
-    $declaration = &CreateValidSGML ($declaration);
-    $desc .= "<programlisting>$declaration</programlisting>\n";
+    my $decl_out = &CreateValidSGML ($declaration);
+    $desc .= "<programlisting>$decl_out</programlisting>\n";
 
     $desc .= &MakeDeprecationNote($symbol);
 
@@ -1602,8 +1602,8 @@
     $desc .= "\n";
     $desc .= OutputSymbolExtraLinks($symbol);
 
-    $declaration = &CreateValidSGML ($declaration);
-    $desc .= "<programlisting>$declaration</programlisting>\n";
+    my $decl_out = &CreateValidSGML ($declaration);
+    $desc .= "<programlisting>$decl_out</programlisting>\n";
 
     $desc .= &MakeDeprecationNote($symbol);
 
@@ -3181,9 +3181,9 @@
 	    my $type = $ArgTypes[$i];
 	    my $type_output;
 	    my $range = $ArgRanges[$i];
-	    my $range_output = CreateValidSGML($range);
+	    my $range_output = CreateValidSGML ($range);
 	    my $default = $ArgDefaults[$i];
-	    my $default_output = CreateValidSGML($default);
+	    my $default_output = CreateValidSGML ($default);
 
 	    if ($type eq "GtkString") {
 		$type = "char*";