--- cdli/cdli_files.py	2008/01/14 18:54:46	1.80.2.16
+++ cdli/cdli_files.py	2008/01/18 20:53:49	1.80.2.18
@@ -108,7 +108,7 @@ def formatAtfFullLineNum(txt, nolemma=Tr
                 surf = line.replace(words[0],surfaces[words[0]]).strip()
             
             elif words[0] == '@column':
-                col = words[1]
+                col = ''.join(words[1:])
             
         elif line and line[0] in '123456789':
             # ordinary line -> add line number
@@ -2238,7 +2238,7 @@ class CDLIRoot(Folder):
         # split search terms again (for grapheme search with words)
         splitwords = dict(((w,self.splitter[indexName].process([w])) for w in words))
             
-        for line in file.linesplit():
+        for line in file.splitlines():
             line = unicodify(line)
             # ignore lemma and other lines
             if line.lstrip().startswith('#lem:'):