--- a/trunk/src/cmd/DDoc.d	Tue Feb 19 19:30:04 2008 +0100
+++ b/trunk/src/cmd/DDoc.d	Wed Feb 20 01:24:19 2008 +0100
@@ -90,10 +90,10 @@
   mtable.insert("MODPATH", mod.getFQNPath() ~ mod.fileExtension());
 
   mtable.insert("TITLE", mod.getFQN());
-  mtable.insert("DOCFILENAME", mod.getFQN());
+  mtable.insert("DOCFILENAME", mod.getFQN() ~ ".html");
   auto timeStr = Time.toString();
   mtable.insert("DATETIME", timeStr);
-  mtable.insert("YEAR", timeStr[20..24]);
+  mtable.insert("YEAR", Time.year(timeStr));
 
   auto doc = new DDocEmitter(mtable, incUndoc, mod, tokenHL);
   doc.emit();
@@ -429,7 +429,7 @@
     auto basesBegin = bases[0].begin.prevNWS;
     if (basesBegin.kind == TOK.Colon)
       basesBegin = bases[0].begin;
-    text ~= " : " ~ escape(textSpan(basesBegin, bases[$-1].end));
+    write(" : ", escape(textSpan(basesBegin, bases[$-1].end)));
   }
 
   void write(char[][] strings...)
@@ -441,9 +441,7 @@
   void SYMBOL(char[] name, Declaration d)
   {
     auto loc = d.begin.getRealLocation();
-    auto str = Format("$(SYMBOL {}, {}, {}.{}, {})",
-                      name, modul.getFQN(), modul.getFQNPath(),
-                      modul.fileExtension(), loc.lineNum);
+    auto str = Format("$(SYMBOL {}, {})", name, loc.lineNum);
     write(str);
     // write("$(DDOC_PSYMBOL ", name, ")");
   }