Add <span> tag and limited support for CSS styles to wxHTML.

Parse "style" attributes of the HTML tags and honour those of them that can be mapped to the HTML 3 attributes. Also add a handler for <span> tag. Closes #10631. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-30 23:12:25 +00:00
parent c9554803fa
commit f68e16c5fc
26 changed files with 590 additions and 3 deletions
--- a/src/html/m_span.cpp
+++ b/src/html/m_span.cpp
@@ -0,0 +1,125 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/html/m_span.cpp
+// Purpose:     wxHtml module for span handling
+// Author:      Nigel Paton
+// RCS-ID:      $Id$
+// Copyright:   wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_HTML
+
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"
+#include "wx/fontenum.h"
+#include "wx/tokenzr.h"
+#include "wx/html/styleparams.h"
+
+FORCE_LINK_ME(m_span)
+
+
+TAG_HANDLER_BEGIN(SPAN, "SPAN" )
+
+    TAG_HANDLER_VARS
+        wxArrayString m_Faces;
+
+    TAG_HANDLER_CONSTR(SPAN) { }
+
+    TAG_HANDLER_PROC(tag)
+    {
+        wxColour oldclr = m_WParser->GetActualColor();
+        int oldsize = m_WParser->GetFontSize();
+        int oldbold = m_WParser->GetFontBold();
+
+        // Load any style parameters
+        wxHtmlStyleParams styleParams(tag);
+
+        wxString str;
+
+        str = styleParams.GetParam(wxS("color"));
+        if ( !str.empty() )
+        {
+            wxColour clr;
+            if ( wxHtmlTag::ParseAsColour(str, &clr) )
+            {
+                m_WParser->SetActualColor(clr);
+                m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));
+            }
+        }
+
+        str = styleParams.GetParam(wxS("font-size"));
+        if ( !str.empty() )
+        {
+            // Point size
+            int foundIndex = str.Find(wxS("pt"));
+            if (foundIndex != wxNOT_FOUND)
+            {
+                str.Truncate(foundIndex);
+
+                long sizeValue;
+                if (str.ToLong(&sizeValue) == true)
+                {
+                    // Set point size
+                    m_WParser->SetFontPointSize(sizeValue);
+                    m_WParser->GetContainer()->InsertCell(
+                         new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+                }
+            }
+            // else: check for other ways of specifying size (TODO)
+        }
+
+        str = styleParams.GetParam(wxS("font-weight"));
+        if ( !str.empty() )
+        {
+            // Only bold and normal supported just now
+            if ( str == wxS("bold") )
+            {
+                m_WParser->SetFontBold(true);
+                m_WParser->GetContainer()->InsertCell(
+                     new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+            }
+            else if ( str == wxS("normal") )
+            {
+                m_WParser->SetFontBold(false);
+                m_WParser->GetContainer()->InsertCell(
+                     new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+            }
+        }
+
+        ParseInner(tag);
+
+        if (oldbold != m_WParser->GetFontBold())
+        {
+            m_WParser->SetFontBold(oldbold);
+            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));
+        }
+
+        return true;
+    }
+
+TAG_HANDLER_END(SPAN)
+
+
+TAGS_MODULE_BEGIN(Spans)
+
+    TAGS_MODULE_ADD(SPAN)
+
+TAGS_MODULE_END(Spans)
+
+#endif // wxUSE_HTML