Compilo.

[wxWidgets.git] / src / html / m_tables.cpp

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index e6505e6898e8e53405a03ba079269d0688016ad1..5fd1f1ece4655f10adbc84cdd9fdb9e3d3b7017a 100644 (file)
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -15,21 +15,13 @@
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 #endif
 

-
-/*
-REMARKS:
-    1. This version of m_tables doesn't support auto-layout algorithm.
-       This means that all columns are of same width unless explicitly specified.
-*/
-
-

 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 


@@ -47,69 +39,87 @@ FORCE_LINK_ME(m_tables)
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 
 

-typedef struct {
-        int width, units;
-                // universal
-        int leftpos, pixwidth, maxrealwidth;
-                // temporary (depends on width of table)
-    } colStruct;
+struct colStruct
+{
+    int width, units;
+            // width of the column either in pixels or percents
+            // ('width' is the number, 'units' determines its meaning)
+    int minWidth, maxWidth;
+            // minimal/maximal column width. This is needed by HTML 4.0
+            // layouting algorithm and can be determined by trying to
+            // layout table cells with width=1 and width=infinity
+    int leftpos, pixwidth, maxrealwidth;
+            // temporary (depends on actual width of table)
+};

 
 

-typedef enum {
-        cellSpan,
-        cellUsed,
-        cellFree
-    } cellState;
+enum cellState
+{
+    cellSpan,
+    cellUsed,
+    cellFree
+};

 
 

-typedef struct {
-        wxHtmlContainerCell *cont;
-        int colspan, rowspan;
-        int minheight, valign;
-        cellState flag;
-    } cellStruct;
+struct cellStruct
+{
+    wxHtmlContainerCell *cont;
+    int colspan, rowspan;
+    int minheight, valign;
+    cellState flag;
+    bool nowrap;
+};

 
 
 class wxHtmlTableCell : public wxHtmlContainerCell
 {
 
 
 class wxHtmlTableCell : public wxHtmlContainerCell
 {

-    protected:
-        /* These are real attributes: */
-        bool m_HasBorders;
-                // should we draw borders or not?
-        int m_NumCols, m_NumRows;
-                // number of columns; rows
-        colStruct *m_ColsInfo;
-                // array of column information
-        cellStruct **m_CellInfo;
-                // 2D array of all cells in the table : m_CellInfo[row][column]
-        int m_Spacing;
-                // spaces between cells
-        int m_Padding;
-                // cells internal indentation
-
-    private:
-        /* ...and these are valid only during parsing of table: */
-        int m_ActualCol, m_ActualRow;
-                // number of actual column (ranging from 0..m_NumCols)
-
-        // default values (for table and row):
-        wxColour m_tBkg, m_rBkg;
-        wxString m_tValign, m_rValign;
-
-        double m_PixelScale;
-
-
-    public:
-        wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
-        ~wxHtmlTableCell();
-        virtual void Layout(int w);
-
-        void AddRow(const wxHtmlTag& tag);
-        void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag);
-    private:
-        void ReallocCols(int cols);
-        void ReallocRows(int rows);
-                // reallocates memory to given number of cols/rows
-                // and changes m_NumCols/m_NumRows value to reflect this change
-                // NOTE! You CAN'T change m_NumCols/m_NumRows before calling this!!
+protected:
+    /* These are real attributes: */
+
+    // should we draw borders or not?
+    bool m_HasBorders;
+    // number of columns; rows
+    int m_NumCols, m_NumRows;
+    // array of column information
+    colStruct *m_ColsInfo;
+    // 2D array of all cells in the table : m_CellInfo[row][column]
+    cellStruct **m_CellInfo;
+    // spaces between cells
+    int m_Spacing;
+    // cells internal indentation
+    int m_Padding;
+
+private:
+    /* ...and these are valid only when parsing the table: */
+
+    // number of actual column (ranging from 0..m_NumCols)
+    int m_ActualCol, m_ActualRow;
+
+    // default values (for table and row):
+    wxColour m_tBkg, m_rBkg;
+    wxString m_tValign, m_rValign;
+
+    double m_PixelScale;
+
+
+public:
+    wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);
+    ~wxHtmlTableCell();
+    virtual void Layout(int w);
+
+    void AddRow(const wxHtmlTag& tag);
+    void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag);
+
+private:
+    // Reallocates memory to given number of cols/rows
+    // and changes m_NumCols/m_NumRows value to reflect this change
+    // NOTE! You CAN'T change m_NumCols/m_NumRows before calling this!!
+    void ReallocCols(int cols);
+    void ReallocRows(int rows);
+
+    // Computes minimal and maximal widths of columns. Needs to be called
+    // only once, before first Layout().
+    void ComputeMinMaxWidths();
+
+    DECLARE_NO_COPY_CLASS(wxHtmlTableCell)

 };
 
 
 };
 
 


@@ -118,7 +128,8 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
  : wxHtmlContainerCell(parent)
 {
     m_PixelScale = pixel_scale;
  : wxHtmlContainerCell(parent)
 {
     m_PixelScale = pixel_scale;

-    m_HasBorders = (tag.GetParam(wxT("BORDER")) != wxT("0"));
+    m_HasBorders =
+            (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));

     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
     m_CellInfo = NULL;
     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
     m_CellInfo = NULL;


@@ -173,6 +184,7 @@ void wxHtmlTableCell::ReallocCols(int cols)
     {
            m_ColsInfo[j].width = 0;
            m_ColsInfo[j].units = wxHTML_UNITS_PERCENT;
     {
            m_ColsInfo[j].width = 0;
            m_ColsInfo[j].units = wxHTML_UNITS_PERCENT;

+           m_ColsInfo[j].minWidth = m_ColsInfo[j].maxWidth = -1;

     }
 
     m_NumCols = cols;
     }
 
     m_NumCols = cols;


@@ -274,7 +286,19 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
     {
         tag.GetParamAsInt(wxT("COLSPAN"), &m_CellInfo[r][c].colspan);
         tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);
     {
         tag.GetParamAsInt(wxT("COLSPAN"), &m_CellInfo[r][c].colspan);
         tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);

-        if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1))
+
+        // VS: the standard says this about col/rowspan:
+        //     "This attribute specifies the number of rows spanned by the
+        //     current cell. The default value of this attribute is one ("1").
+        //     The value zero ("0") means that the cell spans all rows from the
+        //     current row to the last row of the table." All mainstream
+        //     browsers act as if 0==1, though, and so does wxHTML.
+        if (m_CellInfo[r][c].colspan < 1)
+            m_CellInfo[r][c].colspan = 1;
+        if (m_CellInfo[r][c].rowspan < 1)
+            m_CellInfo[r][c].rowspan = 1;
+
+        if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1))

         {
             int i, j;
 
         {
             int i, j;
 


@@ -315,15 +339,71 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
         else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER;
     }
 
         else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER;
     }
 

+    // nowrap
+    if (tag.HasParam(wxT("NOWRAP")))
+        m_CellInfo[r][c].nowrap = true;
+    else
+        m_CellInfo[r][c].nowrap = false;
+

     cell->SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
 }
 
     cell->SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
 }
 

+void wxHtmlTableCell::ComputeMinMaxWidths()
+{
+    if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return;

 
 

+    m_MaxTotalWidth = 0;
+    int percentage = 0;
+    for (int c = 0; c < m_NumCols; c++)
+    {
+        for (int r = 0; r < m_NumRows; r++)
+        {
+            cellStruct& cell = m_CellInfo[r][c];
+            if (cell.flag == cellUsed)
+            {
+                cell.cont->Layout(2*m_Padding + 1);
+                int maxWidth = cell.cont->GetMaxTotalWidth();
+                int width = cell.nowrap?maxWidth:cell.cont->GetWidth();
+                width -= (cell.colspan-1) * m_Spacing;
+                maxWidth -= (cell.colspan-1) * m_Spacing;
+                // HTML 4.0 says it is acceptable to distribute min/max
+                width /= cell.colspan;
+                maxWidth /= cell.colspan;
+                for (int j = 0; j < cell.colspan; j++) {
+                    if (width > m_ColsInfo[c+j].minWidth)
+                        m_ColsInfo[c+j].minWidth = width;
+                    if (maxWidth > m_ColsInfo[c+j].maxWidth)
+                        m_ColsInfo[c+j].maxWidth = maxWidth;
+                }
+            }
+        }
+        // Calculate maximum table width, required for nested tables
+        if (m_ColsInfo[c].units == wxHTML_UNITS_PIXELS)
+            m_MaxTotalWidth += wxMax(m_ColsInfo[c].width, m_ColsInfo[c].minWidth);
+        else if ((m_ColsInfo[c].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[c].width != 0))
+            percentage += m_ColsInfo[c].width;
+        else
+            m_MaxTotalWidth += m_ColsInfo[c].maxWidth;
+    }

 
 

+    if (percentage >= 100)
+    {
+        // Table would have infinite length
+        // Make it ridiculous large
+        m_MaxTotalWidth = 0xFFFFFF;
+    }
+    else
+        m_MaxTotalWidth = m_MaxTotalWidth * 100 / (100 - percentage);

 
 

+    m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing;
+}

 
 void wxHtmlTableCell::Layout(int w)
 {
 
 void wxHtmlTableCell::Layout(int w)
 {

+    ComputeMinMaxWidths();
+
+    wxHtmlCell::Layout(w);
+

     /*
 
     WIDTH ADJUSTING :
     /*
 
     WIDTH ADJUSTING :


@@ -332,8 +412,18 @@ void wxHtmlTableCell::Layout(int w)
 
     if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)
     {
 
     if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)
     {

-        if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
-        else m_Width = m_WidthFloat * w / 100;
+        if (m_WidthFloat < 0)
+        {
+            if (m_WidthFloat < -100)
+                m_WidthFloat = -100;
+            m_Width = (100 + m_WidthFloat) * w / 100;
+        }
+        else
+        {
+            if (m_WidthFloat > 100)
+                m_WidthFloat = 100;
+            m_Width = m_WidthFloat * w / 100;
+        }

     }
     else
     {
     }
     else
     {


@@ -348,31 +438,121 @@ void wxHtmlTableCell::Layout(int w)
 
     */
 
 
     */
 

-    /* 1.  setup columns widths: */
+    /* 1.  setup columns widths:
+
+           The algorithm tries to keep the table size less than w if possible.
+       */

     {
         int wpix = m_Width - (m_NumCols + 1) * m_Spacing;
         int i, j;
     {
         int wpix = m_Width - (m_NumCols + 1) * m_Spacing;
         int i, j;

-        int wtemp = 0;

 
         // 1a. setup fixed-width columns:
         for (i = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS)
 
         // 1a. setup fixed-width columns:
         for (i = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS)

-                wpix -= (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width);
+            {
+                m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width,
+                                               m_ColsInfo[i].minWidth);
+                wpix -= m_ColsInfo[i].pixwidth;
+            }
+
+        // 1b. Calculate maximum possible width if line wrapping would be disabled
+        // Recalculate total width if m_WidthFloat is zero to keep tables as small
+        // as possible.
+        int maxWidth = 0;
+        for (i = 0; i < m_NumCols; i++)
+            if (m_ColsInfo[i].width == 0)
+            {
+                maxWidth += m_ColsInfo[i].maxWidth;
+            }
+
+        if (!m_WidthFloat)
+        {
+            // Recalculate table width since no table width was initially given
+            int newWidth = m_Width - wpix +  maxWidth;
+
+            // Make sure that floating-width columns will have the right size.
+            // Calculate sum of all floating-width columns
+            int percentage = 0;
+            for (i = 0; i < m_NumCols; i++)
+                if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0))
+                    percentage += m_ColsInfo[i].width;
+
+            if (percentage >= 100)
+                newWidth = w;
+            else
+                newWidth = newWidth * 100 / (100 - percentage);
+
+            newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing);
+            wpix -= m_Width - newWidth;
+            m_Width = newWidth;
+        }
+

 
 

-        // 1b. setup floating-width columns:
+        // 1c. setup floating-width columns:
+        int wtemp = wpix;

         for (i = 0; i < m_NumCols; i++)
             if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0))
         for (i = 0; i < m_NumCols; i++)
             if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0))

-                wtemp += (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width * wpix / 100);
-        wpix -= wtemp;
+            {
+                m_ColsInfo[i].pixwidth = wxMin(m_ColsInfo[i].width, 100) * wpix / 100;
+
+                // Make sure to leave enough space for the other columns
+                int minRequired = 0;
+                for (j = 0; j < m_NumCols; j++)
+                {
+                    if ((m_ColsInfo[j].units == wxHTML_UNITS_PERCENT && j > i) ||
+                        !m_ColsInfo[j].width)
+                        minRequired += m_ColsInfo[j].minWidth;
+                }
+                m_ColsInfo[i].pixwidth = wxMax(wxMin(wtemp - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth);
+
+                wtemp -= m_ColsInfo[i].pixwidth;
+            }
+        wpix = wtemp;
+
+        // 1d. setup default columns (no width specification supplied):
+        // The algorithm assigns calculates the maximum possible width if line
+        // wrapping would be disabled and assigns column width as a fraction
+        // based upon the maximum width of a column
+        // FIXME: I'm not sure if this algorithm is conform to HTML standard,
+        //        though it seems to be much better than the old one

 
 

-        // 1c. setup defalut columns (no width specification supplied):
-        // NOTE! This algorithm doesn't conform to HTML standard : it assigns equal widths
-        // instead of optimal

         for (i = j = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].width == 0) j++;
         for (i = j = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].width == 0) j++;

+        if (wpix < 0)
+            wpix = 0;
+
+        // Assign widths

         for (i = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].width == 0)
         for (i = 0; i < m_NumCols; i++)
             if (m_ColsInfo[i].width == 0)

-                m_ColsInfo[i].pixwidth = wpix / j;
+            {
+                // Assign with, make sure not to drop below minWidth
+                if (maxWidth)
+                    m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5);
+                else
+                    m_ColsInfo[i].pixwidth = wpix / j;
+
+                // Make sure to leave enough space for the other columns
+                int minRequired = 0;
+                int r;
+                for (r = i + 1; r < m_NumCols; r++)
+                {
+                    if (!m_ColsInfo[r].width)
+                        minRequired += m_ColsInfo[r].minWidth;
+                }
+                m_ColsInfo[i].pixwidth = wxMax(wxMin(wpix - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth);
+
+                if (maxWidth)
+                {
+                    if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5))
+                    {
+                        int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5));
+                        maxWidth += diff - m_ColsInfo[i].maxWidth;
+                    }
+                    else
+                        maxWidth -= m_ColsInfo[i].maxWidth;
+                }
+                wpix -= m_ColsInfo[i].pixwidth;
+            }

     }
 
     /* 2.  compute positions of columns: */
     }
 
     /* 2.  compute positions of columns: */


@@ -438,6 +618,15 @@ void wxHtmlTableCell::Layout(int w)
         m_Height = ypos[m_NumRows];
         delete[] ypos;
     }
         m_Height = ypos[m_NumRows];
         delete[] ypos;
     }

+
+    /* 4. adjust table's width if it was too small: */
+    if (m_NumCols > 0)
+    {
+        int twidth = m_ColsInfo[m_NumCols-1].leftpos +
+                     m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing;
+        if (twidth > m_Width)
+            m_Width = twidth;
+    }

 }
 
 
 }
 
 


@@ -455,13 +644,11 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
     TAG_HANDLER_VARS
         wxHtmlTableCell* m_Table;
         wxString m_tAlign, m_rAlign;
     TAG_HANDLER_VARS
         wxHtmlTableCell* m_Table;
         wxString m_tAlign, m_rAlign;

-        int m_OldAlign;

 
     TAG_HANDLER_CONSTR(TABLE)
     {
         m_Table = NULL;
         m_tAlign = m_rAlign = wxEmptyString;
 
     TAG_HANDLER_CONSTR(TABLE)
     {
         m_Table = NULL;
         m_tAlign = m_rAlign = wxEmptyString;

-        m_OldAlign = wxHTML_ALIGN_LEFT;

     }
 
 
     }
 
 


@@ -474,28 +661,50 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
         {
             wxHtmlTableCell *oldt = m_Table;
             wxHtmlContainerCell *oldcont;
         {
             wxHtmlTableCell *oldt = m_Table;
             wxHtmlContainerCell *oldcont;

-            int m_OldAlign;

 
             oldcont = c = m_WParser->OpenContainer();
 
 
             oldcont = c = m_WParser->OpenContainer();
 

-            c->SetWidthFloat(tag, m_WParser->GetPixelScale());
-            m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
-            m_OldAlign = m_WParser->GetAlign();
+            m_Table = new wxHtmlTableCell(c, tag);
+
+            // width:
+            {
+                if (tag.HasParam(wxT("WIDTH")))
+                {
+                    wxString wd = tag.GetParam(wxT("WIDTH"));
+
+                    if (wd[wd.Length()-1] == wxT('%'))
+                    {
+                        int width = 0;
+                        wxSscanf(wd.c_str(), wxT("%i%%"), &width);
+                        m_Table->SetWidthFloat(width, wxHTML_UNITS_PERCENT);
+                    }
+                    else
+                    {
+                        int width = 0;
+                        wxSscanf(wd.c_str(), wxT("%i"), &width);
+                        m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS);
+                    }
+                }
+                else
+                    m_Table->SetWidthFloat(0, wxHTML_UNITS_PIXELS);
+            }
+            int oldAlign = m_WParser->GetAlign();

             m_tAlign = wxEmptyString;
             if (tag.HasParam(wxT("ALIGN")))
                 m_tAlign = tag.GetParam(wxT("ALIGN"));
 
             ParseInner(tag);
 
             m_tAlign = wxEmptyString;
             if (tag.HasParam(wxT("ALIGN")))
                 m_tAlign = tag.GetParam(wxT("ALIGN"));
 
             ParseInner(tag);
 

-            m_WParser->SetAlign(m_OldAlign);
+            m_WParser->SetAlign(oldAlign);

             m_WParser->SetContainer(oldcont);
             m_WParser->CloseContainer();
             m_WParser->SetContainer(oldcont);
             m_WParser->CloseContainer();

+

             m_Table = oldt;
             return TRUE;
         }
 
 
             m_Table = oldt;
             return TRUE;
         }
 
 

-        else if (m_Table && !tag.IsEnding())
+        else if (m_Table)

         {
             // new row in table
             if (tag.GetName() == wxT("TR"))
         {
             // new row in table
             if (tag.GetName() == wxT("TR"))


@@ -509,29 +718,29 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
             // new cell
             else
             {
             // new cell
             else
             {

-                m_WParser->SetAlign(m_OldAlign);

                 c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table));
                 m_Table->AddCell(c, tag);
 
                 m_WParser->OpenContainer();
 
                 if (tag.GetName() == wxT("TH")) /*header style*/
                 c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table));
                 m_Table->AddCell(c, tag);
 
                 m_WParser->OpenContainer();
 
                 if (tag.GetName() == wxT("TH")) /*header style*/

-                {

                     m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
                     m_WParser->SetAlign(wxHTML_ALIGN_CENTER);

-                }
+                else
+                    m_WParser->SetAlign(wxHTML_ALIGN_LEFT);
+
+                wxString als;
+
+                als = m_rAlign;
+                if (tag.HasParam(wxT("ALIGN")))
+                    als = tag.GetParam(wxT("ALIGN"));
+                als.MakeUpper();
+                if (als == wxT("RIGHT"))
+                    m_WParser->SetAlign(wxHTML_ALIGN_RIGHT);
+                else if (als == wxT("LEFT"))
+                    m_WParser->SetAlign(wxHTML_ALIGN_LEFT);
+                else if (als == wxT("CENTER"))
+                    m_WParser->SetAlign(wxHTML_ALIGN_CENTER);

 
 

-                {
-                    wxString als;
-
-                    als = m_rAlign;
-                    if (tag.HasParam(wxT("ALIGN")))
-                        als = tag.GetParam(wxT("ALIGN"));
-                    als.MakeUpper();
-                    if (als == wxT("RIGHT"))
-                        m_WParser->SetAlign(wxHTML_ALIGN_RIGHT);
-                    else if (als == wxT("CENTER"))
-                        m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
-                }

                 m_WParser->OpenContainer();
             }
         }
                 m_WParser->OpenContainer();
             }
         }