gtk-doc r545 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Thu Jan 24 13:34:22 2008
New Revision: 545
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=545&view=rev

Log:
	* gtk-doc.xsl:
	  Unbreak fixxref. The index.sgml file should not have leading
	  whitespace. These were caused by indenting the xsl, which is dangerous
	  in case of <xsl:text>.
	* gtkdoc-fixxref.in:
	  Debug logging.



Modified:
   trunk/ChangeLog
   trunk/gtk-doc.xsl
   trunk/gtkdoc-fixxref.in

Modified: trunk/gtk-doc.xsl
==============================================================================
--- trunk/gtk-doc.xsl	(original)
+++ trunk/gtk-doc.xsl	Thu Jan 24 13:34:22 2008
@@ -73,7 +73,8 @@
         <xsl:apply-templates select="//anchor|//refentry|//refsect1|//refsect2|//refsynopsisdiv"
                              mode="generate.index.mode"/>
       </xsl:with-param>
-      <xsl:with-param name="encoding" select="'UTF-8'"/>
+      <xsl:with-param name="default.encoding" select="'UTF-8'"/>
+      <xsl:with-param name="chunker.output.indent" select="'no'"/>
     </xsl:call-template>
   </xsl:template>
 
@@ -87,8 +88,7 @@
           <xsl:text>/</xsl:text>
         </xsl:if>
         <xsl:call-template name="href.target"/>
-        <xsl:text>&quot;&gt;
-      </xsl:text>
+        <xsl:text>&quot;&gt;&#10;</xsl:text>
     </xsl:if>
   </xsl:template>
 
@@ -96,8 +96,7 @@
     <xsl:if test="@role='online-location'">
       <xsl:text>&lt;ONLINE href=&quot;</xsl:text>
         <xsl:value-of select="@url"/>
-        <xsl:text>&quot;&gt;
-      </xsl:text>
+        <xsl:text>&quot;&gt;&#10;</xsl:text>
     </xsl:if>
   </xsl:template>
 

Modified: trunk/gtkdoc-fixxref.in
==============================================================================
--- trunk/gtkdoc-fixxref.in	(original)
+++ trunk/gtkdoc-fixxref.in	Thu Jan 24 13:34:22 2008
@@ -114,7 +114,7 @@
 &ScanIndices ($HTML_DIR, 0);
 push (@VisitedPaths, $HTML_DIR);
 
-# check all extra dirs, but skip already scanned dirs ord subdirs of those
+# check all extra dirs, but skip already scanned dirs or subdirs of those
 foreach my $dir (@EXTRA_DIRS) {
     my $vdir;
     my $skip = 0;
@@ -173,7 +173,7 @@
 
 sub ScanIndex {
     my ($file, $use_absolute_links) = @_;
-#    print "Scanning index file: $file absolute: $use_absolute_links\n";
+    #print "Scanning index file: $file absolute: $use_absolute_links\n";
 
     # Determine the absolute directory, to be added to links in index.sgml
     # if we need to use an absolute link.
@@ -190,7 +190,7 @@
 	|| die "Can't open $file: $!";
     while (<INDEXFILE>) {
 	if (m/^<ANCHOR\s+id\s*=\s*"([^"]*)"\s+href\s*=\s*"([^"]*)"\s*>/) {
-#	    print "Found id: $1 href: $2\n";
+	    #print "Found id: $1 href: $2\n";
 	    $Links{$1} = "$dir$2";
 	}
     }
@@ -217,7 +217,7 @@
 
 sub FixHTMLFile {
     my ($file) = @_;
-#    print "Fixing file: $file\n";
+    #print "Fixing file: $file\n";
 
     open (HTMLFILE, $file)
 	|| die "Can't open $file: $!";
@@ -245,9 +245,10 @@
     my $href = $Links{$id};
 
     if ($href) {
-#        print "  Fixing link: $id, $href, $text\n";
+        # print "  Fixing link: $id, $href, $text\n";
         return "<a\nhref=\"$href\"\n>$text</a>";
     } else {
+        # print "  no link for: $id, $text\n";
 	return $text;
     }
 }