No changes, just remove an extra pair of braces in wxHTML code.

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

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 4f7471622e3dc28d6097b2ffd46da664503f2028..9b8380d06d9186881ecdaf4114ab14dc84a7f77a 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -1,27 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        m_fonts.cpp
+// Name:        src/html/m_fonts.cpp

 // Purpose:     wxHtml module for fonts & colors of fonts
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxHtml module for fonts & colors of fonts
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

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

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

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
-#include "wx/wx.h"
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP

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


@@ -32,90 +26,105 @@
 FORCE_LINK_ME(m_fonts)
 
 
 FORCE_LINK_ME(m_fonts)
 
 

-TAG_HANDLER_BEGIN(FONT, "FONT")
+TAG_HANDLER_BEGIN(FONT, "FONT" )

 
     TAG_HANDLER_VARS
 
     TAG_HANDLER_VARS

-        wxSortedArrayString m_Faces;
+        wxArrayString m_Faces;
+
+    TAG_HANDLER_CONSTR(FONT) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        wxColour oldclr = m_WParser -> GetActualColor();
-        int oldsize = m_WParser -> GetFontSize();
-        wxString oldface = m_WParser -> GetFontFace();
+        wxColour oldclr = m_WParser->GetActualColor();
+        int oldsize = m_WParser->GetFontSize();
+        wxString oldface = m_WParser->GetFontFace();

 
 

-        if (tag.HasParam(wxT("COLOR"))) {
-            unsigned long tmp = 0; 
+        if (tag.HasParam(wxT("COLOR")))
+        {

             wxColour clr;
             wxColour clr;

-            if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1) {
-                clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
-                m_WParser -> SetActualColor(clr);
-                m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr));
+            if (tag.GetParamAsColour(wxT("COLOR"), &clr))
+            {
+                m_WParser->SetActualColor(clr);
+                m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));

             }
         }
 
             }
         }
 

-        if (tag.HasParam(wxT("SIZE"))) {
+        if (tag.HasParam(wxT("SIZE")))
+        {

             long tmp = 0;
             long tmp = 0;

-            wxChar c = tag.GetParam(wxT("SIZE"))[(unsigned int) 0];
-            if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1) {
-                if (c == '+' || c == '-')
-                    m_WParser -> SetFontSize(oldsize+tmp);
+            const wxString sizeStr = tag.GetParam(wxT("SIZE"));
+            if (sizeStr.ToLong(&tmp))
+            {
+                wxChar c = sizeStr[0];
+                if (c == wxT('+') || c == wxT('-'))
+                    m_WParser->SetFontSize(oldsize+tmp);

                 else
                 else

-                    m_WParser -> SetFontSize(tmp);
-                m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+                    m_WParser->SetFontSize(tmp);
+                m_WParser->GetContainer()->InsertCell(
+                    new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

             }
         }
             }
         }

-        
-        if (tag.HasParam(wxT("FACE"))) {
-            if (m_Faces.GetCount() == 0) {
-                wxFontEnumerator enu;
-                enu.EnumerateFacenames();
-                m_Faces = *enu.GetFacenames();
-            }
-            wxStringTokenizer tk(tag.GetParam(wxT("FACE")), ",");
+
+        if (tag.HasParam(wxT("FACE")))
+        {
+            if (m_Faces.GetCount() == 0)
+                m_Faces = wxFontEnumerator::GetFacenames();
+
+            wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(","));

             int index;
             int index;

-            
-            while (tk.HasMoreTokens()) 
-                if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND) {
-                    m_WParser -> SetFontFace(m_Faces[index]);
-                    m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+
+            while (tk.HasMoreTokens())
+            {
+                if ((index = m_Faces.Index(tk.GetNextToken(), false)) != wxNOT_FOUND)
+                {
+                    m_WParser->SetFontFace(m_Faces[index]);
+                    m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

                     break;
                 }
                     break;
                 }

+            }

         }
 
         ParseInner(tag);
 
         }
 
         ParseInner(tag);
 

-        if (oldface != m_WParser -> GetFontFace()) {
-            m_WParser -> SetFontFace(oldface);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        }        
-        if (oldsize != m_WParser -> GetFontSize()) {
-            m_WParser -> SetFontSize(oldsize);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        }        
-        if (oldclr != m_WParser -> GetActualColor()) {
-            m_WParser -> SetActualColor(oldclr);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(oldclr));
+        if (oldface != m_WParser->GetFontFace())
+        {
+            m_WParser->SetFontFace(oldface);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        }
+        if (oldsize != m_WParser->GetFontSize())
+        {
+            m_WParser->SetFontSize(oldsize);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

         }
         }

-        return TRUE;
+        if (oldclr != m_WParser->GetActualColor())
+        {
+            m_WParser->SetActualColor(oldclr);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
+        }
+        return true;

     }
 
 TAG_HANDLER_END(FONT)
 
 
     }
 
 TAG_HANDLER_END(FONT)
 
 

-TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
+TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE,DEL")
+
+    TAG_HANDLER_CONSTR(FACES_U) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int underlined = m_WParser -> GetFontUnderlined();
+        int underlined = m_WParser->GetFontUnderlined();

 
 

-        m_WParser -> SetFontUnderlined(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontUnderlined(true);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontUnderlined(underlined);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        return TRUE;
+        m_WParser->SetFontUnderlined(underlined);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        return true;

     }
 
 TAG_HANDLER_END(FACES_U)
     }
 
 TAG_HANDLER_END(FACES_U)


@@ -124,19 +133,22 @@ TAG_HANDLER_END(FACES_U)
 
 
 TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
 
 
 TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")

+    TAG_HANDLER_CONSTR(FACES_B) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int bold = m_WParser -> GetFontBold();
+        int bold = m_WParser->GetFontBold();

 
 

-        m_WParser -> SetFontBold(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontBold(true);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontBold(bold);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        return TRUE;
+        m_WParser->SetFontBold(bold);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        return true;

     }
 
 TAG_HANDLER_END(FACES_B)
     }
 
 TAG_HANDLER_END(FACES_B)


@@ -145,19 +157,22 @@ TAG_HANDLER_END(FACES_B)
 
 
 TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
 
 
 TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")

+    TAG_HANDLER_CONSTR(FACES_I) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int italic = m_WParser -> GetFontItalic();
+        int italic = m_WParser->GetFontItalic();

 
 

-        m_WParser -> SetFontItalic(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontItalic(true);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontItalic(italic);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        return TRUE;
+        m_WParser->SetFontItalic(italic);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        return true;

     }
 
 TAG_HANDLER_END(FACES_I)
     }
 
 TAG_HANDLER_END(FACES_I)


@@ -166,19 +181,22 @@ TAG_HANDLER_END(FACES_I)
 
 
 TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
 
 
 TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")

+    TAG_HANDLER_CONSTR(FACES_TT) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int fixed = m_WParser -> GetFontFixed();
+        int fixed = m_WParser->GetFontFixed();

 
 

-        m_WParser -> SetFontFixed(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontFixed(true);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontFixed(fixed);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        return TRUE;
+        m_WParser->SetFontFixed(fixed);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        return true;

     }
 
 TAG_HANDLER_END(FACES_TT)
     }
 
 TAG_HANDLER_END(FACES_TT)


@@ -188,92 +206,100 @@ TAG_HANDLER_END(FACES_TT)
 
 
 TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
 
 
 TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")

+    TAG_HANDLER_CONSTR(Hx) { }

 
     TAG_HANDLER_PROC(tag)
     {
         int old_size, old_b, old_i, old_u, old_f, old_al;
         wxHtmlContainerCell *c;
 
 
     TAG_HANDLER_PROC(tag)
     {
         int old_size, old_b, old_i, old_u, old_f, old_al;
         wxHtmlContainerCell *c;
 

-        old_size = m_WParser -> GetFontSize();
-        old_b = m_WParser -> GetFontBold();
-        old_i = m_WParser -> GetFontItalic();
-        old_u = m_WParser -> GetFontUnderlined();
-        old_f = m_WParser -> GetFontFixed();
-        old_al = m_WParser -> GetAlign();
+        old_size = m_WParser->GetFontSize();
+        old_b = m_WParser->GetFontBold();
+        old_i = m_WParser->GetFontItalic();
+        old_u = m_WParser->GetFontUnderlined();
+        old_f = m_WParser->GetFontFixed();
+        old_al = m_WParser->GetAlign();

 
 

-        m_WParser -> SetFontBold(TRUE);
-        m_WParser -> SetFontItalic(FALSE);
-        m_WParser -> SetFontUnderlined(FALSE);
-        m_WParser -> SetFontFixed(FALSE);
+        m_WParser->SetFontBold(true);
+        m_WParser->SetFontItalic(false);
+        m_WParser->SetFontUnderlined(false);
+        m_WParser->SetFontFixed(false);

 
         if (tag.GetName() == wxT("H1"))
 
         if (tag.GetName() == wxT("H1"))

-                m_WParser -> SetFontSize(7);
+                m_WParser->SetFontSize(7);

         else if (tag.GetName() == wxT("H2"))
         else if (tag.GetName() == wxT("H2"))

-                m_WParser -> SetFontSize(6);
+                m_WParser->SetFontSize(6);

         else if (tag.GetName() == wxT("H3"))
         else if (tag.GetName() == wxT("H3"))

-                m_WParser -> SetFontSize(5);
-        else if (tag.GetName() == wxT("H4")) {
-                m_WParser -> SetFontSize(5);
-                m_WParser -> SetFontItalic(TRUE);
-                m_WParser -> SetFontBold(FALSE);
+                m_WParser->SetFontSize(5);
+        else if (tag.GetName() == wxT("H4"))
+        {
+                m_WParser->SetFontSize(5);
+                m_WParser->SetFontItalic(true);
+                m_WParser->SetFontBold(false);

         }
         else if (tag.GetName() == wxT("H5"))
         }
         else if (tag.GetName() == wxT("H5"))

-                m_WParser -> SetFontSize(4);
-        else if (tag.GetName() == wxT("H6")) {
-                m_WParser -> SetFontSize(4);
-                m_WParser -> SetFontItalic(TRUE);
-                m_WParser -> SetFontBold(FALSE);
+                m_WParser->SetFontSize(4);
+        else if (tag.GetName() == wxT("H6"))
+        {
+                m_WParser->SetFontSize(4);
+                m_WParser->SetFontItalic(true);
+                m_WParser->SetFontBold(false);

         }
 
         }
 

-        c = m_WParser -> GetContainer();
-        if (c -> GetFirstCell()) {
-            m_WParser -> CloseContainer();
-            m_WParser -> OpenContainer();
-            c = m_WParser -> GetContainer();
+        c = m_WParser->GetContainer();
+        if (c->GetFirstChild())
+        {
+            m_WParser->CloseContainer();
+            m_WParser->OpenContainer();
+            c = m_WParser->GetContainer();

         }
         }

-        c = m_WParser -> GetContainer();
+        c = m_WParser->GetContainer();

 
 

-        c -> SetAlign(tag);
-        c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
-        m_WParser -> SetAlign(c -> GetAlignHor());
+        c->SetAlign(tag);
+        c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
+        m_WParser->SetAlign(c->GetAlignHor());

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontSize(old_size);
-        m_WParser -> SetFontBold(old_b);
-        m_WParser -> SetFontItalic(old_i);
-        m_WParser -> SetFontUnderlined(old_u);
-        m_WParser -> SetFontFixed(old_f);
-        m_WParser -> SetAlign(old_al);
-
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        m_WParser -> CloseContainer();
-        m_WParser -> OpenContainer();
-        c = m_WParser -> GetContainer();
-        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
-
-        return TRUE;
+        m_WParser->SetFontSize(old_size);
+        m_WParser->SetFontBold(old_b);
+        m_WParser->SetFontItalic(old_i);
+        m_WParser->SetFontUnderlined(old_u);
+        m_WParser->SetFontFixed(old_f);
+        m_WParser->SetAlign(old_al);
+
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        m_WParser->CloseContainer();
+        m_WParser->OpenContainer();
+        c = m_WParser->GetContainer();
+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
+
+        return true;

     }
 
 TAG_HANDLER_END(Hx)
 
 
 TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
     }
 
 TAG_HANDLER_END(Hx)
 
 
 TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")

+    TAG_HANDLER_CONSTR(BIGSMALL) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int oldsize = m_WParser -> GetFontSize();
+        int oldsize = m_WParser->GetFontSize();

         int sz = (tag.GetName() == wxT("BIG")) ? +1 : -1;
 
         int sz = (tag.GetName() == wxT("BIG")) ? +1 : -1;
 

-        m_WParser -> SetFontSize(sz);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontSize(sz);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontSize(oldsize);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        return TRUE;
+        m_WParser->SetFontSize(oldsize);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        return true;

     }
 
 TAG_HANDLER_END(BIGSMALL)
     }
 
 TAG_HANDLER_END(BIGSMALL)