@@ -95,9 +95,10 @@ class TextPane(Action):

     def read_file(self, text_file_path, line_width):

         with open(text_file_path, "r") as f:

             for line in f:

-                # remove the trailing line feeds

-                while line.endswith('\r') or line.endswith('\n'):

-                    line = line[:-1]

+                # remove the trailing white space.

+                line = line.rstrip()

+                # expand tab to 8 spaces.

+                line = line.expandtabs()

                 # Adjust the words on the lines

                 while len(line) > line_width:

                     sep_index = line_width

@@ -109,8 +110,8 @@ class TextPane(Action):

                     if sep_index == 0:

                         current_line_width = line_width

                     currLine = line[:current_line_width]

-                    line = line.strip()

                     line = line[current_line_width:]

+                    line = line.strip()

                     # Lengthen the line with spaces

                     self.lines.append(currLine + ' ' * (line_width - len(currLine)))