diff -r 000000000000 -r 9a66ca7c79fa test/tools/javadoc/T4994049/T4994049.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javadoc/T4994049/T4994049.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug     4994049
+ * @summary Unit test for SourcePosition.column with respect to tab expansion
+ * @author  Peter von der Ah\u00e9
+ * @run main T4994049 FileWithTabs.java
+ */
+
+import com.sun.javadoc.*;
+import java.io.File;
+import static com.sun.tools.javadoc.Main.execute;
+
+public class T4994049 extends Doclet {
+
+    public static boolean start(RootDoc root) {
+        for (ClassDoc klass : root.classes()) {
+            for (MethodDoc method : klass.methods()) {
+                if (method.name().equals("tabbedMethod")) {
+                    if (method.position().column() == 21) {
+                        System.out.println(method.position().column() + ": OK!");
+                        return true;
+                    } else {
+                        System.err.println(method.position() + ": wrong tab expansion");
+                        return false;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public static void main(String... args) {
+        for (String file : args) {
+            File source = new File(System.getProperty("test.src", "."), file);
+            if (execute("javadoc", "T4994049", new String[]{source.getPath()} ) != 0)
+                throw new Error();
+        }
+    }
+
+}