gtk-doc r564 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Thu May  8 15:25:14 2008
New Revision: 564
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=564&view=rev

Log:
	* gtkdoc-mkdb.in:
	* gtkdoc-mktmpl.in:
	  Fix a long standing bug that killed spaces in tmpl files.



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

Modified: trunk/gtkdoc-mkdb.in
==============================================================================
--- trunk/gtkdoc-mkdb.in	(original)
+++ trunk/gtkdoc-mkdb.in	Thu May  8 15:25:14 2008
@@ -3435,15 +3435,18 @@
         $AllSymbols{$symbol} = 1;
 
 	my $have_tmpl_docs = 0;
+	my $check_tmpl_doc = "";
 
 	## See if the symbol is documented in template
 	my $tmpl_doc = $SymbolDocs{$symbol};
-	$tmpl_doc = defined ($tmpl_doc) ? $tmpl_doc : "";
-	$tmpl_doc =~ s/<\/?[a-z]+>//g;
-	$tmpl_doc =~ s/\s//g;
-	if ($tmpl_doc ne "") {
+	$check_tmpl_doc = defined ($tmpl_doc) ? $tmpl_doc : "";
+	# remove all xml-tags and whitespaces
+	$check_tmpl_doc =~ s/<\/?[a-z]+>//g;
+	$check_tmpl_doc =~ s/\s//g;
+	# anything left ?
+	if ($check_tmpl_doc ne "") {
 	    $have_tmpl_docs = 1;
-            #print "## [$tmpl_doc]\n";
+            #print "## [$check_tmpl_doc]\n";
 	}
 
 	if (exists ($SourceSymbolDocs{$symbol})) {
@@ -3883,7 +3886,7 @@
 #		insert the documentation at the appropriate places.
 #		It outputs %SymbolTypes, %SymbolDocs and %SymbolParams, which
 #		is a hash of arrays.
-#		NOTE: This function is duplicated in gtkdoc-mkdb (but
+#		NOTE: This function is duplicated in gtkdoc-mktmpl (but
 #		slightly different).
 # Arguments   : $docsfile - the template file to read in.
 #		$skip_unused_params - 1 if the unused parameters should be

Modified: trunk/gtkdoc-mktmpl.in
==============================================================================
--- trunk/gtkdoc-mktmpl.in	(original)
+++ trunk/gtkdoc-mktmpl.in	Thu May  8 15:25:14 2008
@@ -1053,7 +1053,7 @@
 	return 0;
     }
 
-    my $CurrentType = "";	# Type of symbol being read.
+    my $CurrentType = ""; 	# Type of symbol being read.
     my $CurrentSymbol = "";	# Name of symbol being read.
     my $SymbolDoc = "";		# Description of symbol being read.
     my @Params;			# Parameter names and descriptions of current
@@ -1075,8 +1075,8 @@
 		|| $symbol eq "See_Also"
 		|| $symbol eq "Stability_Level") {
 		$symbol = $docsfile . ":" . $symbol;
-#		print "Found symbol: $symbol\n";
 	    }
+#	    print "Found symbol: $symbol\n";
 
 	    # Canonicalize signal and argument names to have -, not _
 	    if ($type eq "ARG" || $type eq "SIGNAL") {
@@ -1088,6 +1088,7 @@
 		$SymbolDoc =~ s/\s+$//;
 		$SymbolTypes{$CurrentSymbol} = $CurrentType;
 		$SymbolDocs{$CurrentSymbol} = $SymbolDoc;
+
 		if ($CurrentParam >= 0) {
 		    $SymbolParams{$CurrentSymbol} = [ @Params ];
 		} else {
@@ -1149,9 +1150,11 @@
 
     # Remember to finish the current symbol doccs.
     if ($CurrentSymbol ne "") {
+
 	$SymbolDoc =~ s/\s+$//;
 	$SymbolTypes{$CurrentSymbol} = $CurrentType;
 	$SymbolDocs{$CurrentSymbol} = $SymbolDoc;
+
 	if ($CurrentParam >= 0) {
 	    $SymbolParams{$CurrentSymbol} = [ @Params ];
 	} else {