diff --git a/src/table_io.adb b/src/table_io.adb
index a51e1716..e7adf22d 100644
--- a/src/table_io.adb
+++ b/src/table_io.adb
@@ -1,4 +1,6 @@
 with Ada.Containers;
+with Ada.Strings.Fixed;
+
 with GNAT.IO;
 
 package body Table_IO is
@@ -36,17 +38,43 @@ package body Table_IO is
       T.Rows.Append (String_Vectors.Empty_Vector);
    end New_Row;
 
+   ----------------
+   -- Put_Padded --
+   ----------------
+
+   procedure Put_Padded (T     : Table;
+                         Col   : Positive;
+                         Text  : String;
+                         Align : Ada.Strings.Alignment)
+   is
+      Field : String (1 .. T.Max_Widths (Col));
+   begin
+      Ada.Strings.Fixed.Move (Text,
+                              Field,
+                              Drop    => Ada.Strings.Error,
+                              Justify => Align);
+      GNAT.IO.Put (Field);
+   end Put_Padded;
+
    -----------
    -- Print --
    -----------
 
-   procedure Print (T : Table; Separator : String := " ") is
-      use Gnat.IO;
+   procedure Print  (T         : Table;
+                    Separator : String := " ";
+                     Align     : Alignments := (1 .. 0 => <>))
+   is
+      use GNAT.IO;
    begin
       for Row of T.Rows loop
          for I in 1 .. Natural (Row.Length) loop
-            Put (Row (I));
-            Put (String'(1 .. T.Max_Widths (I) - String'(Row (I))'Length => ' '));
+            Put_Padded (T,
+                        I,
+                        Row (I),
+                        (if Align'Length >= I
+                         then Align (I)
+                         else Ada.Strings.Left));
+
             if I < Natural (Row.Length) then
                Put (Separator);
             else
diff --git a/src/table_io.ads b/src/table_io.ads
index 211006b2..f3ee876e 100644
--- a/src/table_io.ads
+++ b/src/table_io.ads
@@ -1,6 +1,8 @@
 with Ada.Containers.Indefinite_Vectors;
 with Ada.Containers.Vectors;
 
+with Ada.Strings;
+
 package Table_IO with Preelaborate is
 
    type Table is tagged private;
@@ -9,7 +11,11 @@ package Table_IO with Preelaborate is
 
    procedure New_Row (T : in out Table);
 
-   procedure Print (T : Table; Separator : String := " ");
+   type Alignments is array (Positive range <>) of Ada.Strings.Alignment;
+
+   procedure Print (T         : Table;
+                    Separator : String := " ";
+                    Align     : Alignments := (1 .. 0 => <>));
 
 private