Final scrolling updates

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index ce88a8c569602a1d202f0c6888cfed7006a4d437..fdbdbada98ca232ee04c2bb55ac639d0eea0ce27 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -135,113 +135,149 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
     if (m_Word.Find(wxT('&')) != -1) 
     {
 #define ESCSEQ(escape, subst)  \
     if (m_Word.Find(wxT('&')) != -1) 
     {
 #define ESCSEQ(escape, subst)  \

-                  { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } 
-        static wxChar* substitutions[][3] = 
+                  { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) }
+        static wxChar* substitutions[][4] =

                 {
                 ESCSEQ("quot", "\""),
                 {
                 ESCSEQ("quot", "\""),

+                ESCSEQ("#34", "\""),
+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),

                 ESCSEQ("lt", "<"),
                 ESCSEQ("lt", "<"),

+                ESCSEQ("#60", "<"),

                 ESCSEQ("gt", ">"),
                 ESCSEQ("gt", ">"),

+                ESCSEQ("#62", ">"),
+
+                ESCSEQ("#94", "^"), /* ^ */

     
                 ESCSEQ("nbsp", " "),
     
                 ESCSEQ("nbsp", " "),

+                ESCSEQ("#32", " "),

                 ESCSEQ("iexcl", "!"),
                 ESCSEQ("iexcl", "!"),

-                ESCSEQ("cent", "¢"),
+                ESCSEQ("#33", "!"),
+                ESCSEQ("cent", "¢"/* ¢ */),
+                ESCSEQ("#162", "¢"/* ¢ */),

     
     

-                ESCSEQ("yen", " "),
-                ESCSEQ("brkbar", " "),
-                ESCSEQ("sect", " "),
-                ESCSEQ("uml", " "),
+                ESCSEQ("trade", "(TM)"),
+                ESCSEQ("#153", "(TM)"),
+                ESCSEQ("#8482", "(TM)"),
+
+                ESCSEQ("yen", "¥"),
+                ESCSEQ("#165", "¥"),
+                ESCSEQ("brkbar", "¦"),
+                ESCSEQ("#166", "¦"),
+                ESCSEQ("sect", "§"),
+                ESCSEQ("#167", "§"),
+                ESCSEQ("uml", "¨"),
+                ESCSEQ("#168", "¨"),

     
     

-                ESCSEQ("copy", "(c)"),
-                ESCSEQ("ordf", " "),
-                ESCSEQ("laquo", " "),
-                ESCSEQ("not", " "),
+                ESCSEQ("copy", "©"), /* © */
+                ESCSEQ("#169", "©"),
+                ESCSEQ("ordf", "ª"),
+                ESCSEQ("#170", "ª"),
+                ESCSEQ("laquo", "«"), /* « */
+                ESCSEQ("#171", "«"),
+                ESCSEQ("not", "¬"),
+                ESCSEQ("#172", "¬"),

     
     

-                ESCSEQ("reg", "(r)"),
+                ESCSEQ("reg", "®"), /* ® */
+                ESCSEQ("#174", "®"),

     
     

-                ESCSEQ("deg", " "),
-                ESCSEQ("plusm", " "),
+                ESCSEQ("deg", "°"), /* ° */
+                ESCSEQ("#176", "°"),
+                ESCSEQ("plusm", "±"), /* ± */
+                ESCSEQ("#177", "±"),

     
     

-                ESCSEQ("acute", " "),
-                ESCSEQ("micro", " "),
-                ESCSEQ("para", " "),
+                ESCSEQ("acute", "´"),
+                ESCSEQ("#180", "´"),
+                ESCSEQ("macron", "¯"),
+                ESCSEQ("#175", "¯"),
+                ESCSEQ("micro", "µ"), /* µ */
+                ESCSEQ("#181", "µ"),
+                ESCSEQ("para", "¶"), /* ¶ */
+                ESCSEQ("#182", "¶"),

     
     

-                ESCSEQ("ordm", " "),
-                ESCSEQ("raquo", " "),
+                ESCSEQ("ordm", "º"), /* º */
+                ESCSEQ("#186", "º"),
+                ESCSEQ("raquo", "»"), /* » */
+                ESCSEQ("#187", "»"),

     
     

-                ESCSEQ("iquest", " "),
-                ESCSEQ("Agrave", "À"),
+                ESCSEQ("iquest", "¿"), /* ¿ */
+                ESCSEQ("#191", "¿"),
+                ESCSEQ("Agrave", "\300"/* À */),
+                ESCSEQ("#193", "\300"/* À */),

     
     

-                ESCSEQ("Acirc", "Â"),
-                ESCSEQ("Atilde", "Ã"),
-                ESCSEQ("Auml", "Ä"),
+                ESCSEQ("Acirc", "\302"/* Â */),
+                ESCSEQ("Atilde", "\303"/* Ã */),
+                ESCSEQ("Auml", "\304"/* Ä */),

                 ESCSEQ("Aring", " "),
                 ESCSEQ("AElig", " "),
                 ESCSEQ("Aring", " "),
                 ESCSEQ("AElig", " "),

-                ESCSEQ("Ccedil", "ç"),
-                ESCSEQ("Egrave", "È"),
-                ESCSEQ("Eacute", "É"),
-                ESCSEQ("Ecirc", "Ê"),
-                ESCSEQ("Euml", "Ë"),
-                ESCSEQ("Igrave", "Ì"),
-
-                ESCSEQ("Icirc", "Î"),
-                ESCSEQ("Iuml", "Ï"),
+                ESCSEQ("Ccedil", "\347"/* ç */),
+                ESCSEQ("Egrave", "\310"/* È */),
+                ESCSEQ("Eacute", "\311"/* É */),
+                ESCSEQ("Ecirc", "\312"/* Ê */),
+                ESCSEQ("Euml", "\313"/* Ë */),
+                ESCSEQ("Igrave", "\314"/* Ì */),
+
+                ESCSEQ("Icirc", "\316"/* Î */),
+                ESCSEQ("Iuml", "\317"/* Ï */),

     
     

-                ESCSEQ("Ntilde", "Ñ"),
-                ESCSEQ("Ograve", "Ò"),
+                ESCSEQ("Ntilde", "\321"/* Ñ */),
+                ESCSEQ("Ograve", "\322"/* Ò */),

     
     

-                ESCSEQ("Ocirc", "Ô"),
-                ESCSEQ("Otilde", "Õ"),
-                ESCSEQ("Ouml", "Ö"),
+                ESCSEQ("Ocirc", "\324"/* Ô */),
+                ESCSEQ("Otilde", "\325"/* Õ */),
+                ESCSEQ("Ouml", "\326"/* Ö */),

     
                 ESCSEQ("Oslash", " "),
     
                 ESCSEQ("Oslash", " "),

-                ESCSEQ("Ugrave", "Ù"),
+                ESCSEQ("Ugrave", "\331"/* Ù */),

     
                 ESCSEQ("Ucirc", " "),
     
                 ESCSEQ("Ucirc", " "),

-                ESCSEQ("Uuml", "Ü"),
+                ESCSEQ("Uuml", "\334"/* Ü */),

     
     

-                ESCSEQ("szlig", "§"),
-                ESCSEQ("agrave;","à"),
-                ESCSEQ("aacute", "á"),
-                ESCSEQ("acirc", "â"),
-                ESCSEQ("atilde", "ã"),
-                ESCSEQ("auml", "ä"),
+                ESCSEQ("szlig", "\247"/* § */),
+                ESCSEQ("agrave","à"),
+                ESCSEQ("aacute", "\341"/* á */),
+                ESCSEQ("acirc", "\342"/* â */),
+                ESCSEQ("atilde", "\343"/* ã */),
+                ESCSEQ("auml", "\344"/* ä */),

                 ESCSEQ("aring", "a"),
                 ESCSEQ("aelig", "ae"),
                 ESCSEQ("aring", "a"),
                 ESCSEQ("aelig", "ae"),

-                ESCSEQ("ccedil", "ç"),
-                ESCSEQ("egrave", "è"),
-                ESCSEQ("eacute", "é"),
-                ESCSEQ("ecirc", "ê"),
-                ESCSEQ("euml", "ë"),
-                ESCSEQ("igrave", "ì"),
-                ESCSEQ("iacute", "í"),
+                ESCSEQ("ccedil", "\347"/* ç */),
+                ESCSEQ("egrave", "\350"/* è */),
+                ESCSEQ("eacute", "\351"/* é */),
+                ESCSEQ("ecirc", "\352"/* ê */),
+                ESCSEQ("euml", "\353"/* ë */),
+                ESCSEQ("igrave", "\354"/* ì */),
+                ESCSEQ("iacute", "\355"/* í */),

                 ESCSEQ("icirc", " "),
                 ESCSEQ("icirc", " "),

-                ESCSEQ("iuml", "ï"),
+                ESCSEQ("iuml", "\357"/* ï */),

                 ESCSEQ("eth", " "),
                 ESCSEQ("eth", " "),

-                ESCSEQ("ntilde", "ñ"),
-                ESCSEQ("ograve", "ò"),
-                ESCSEQ("oacute", "ó"),
-                ESCSEQ("ocirc", "ô"),
-                ESCSEQ("otilde", "õ"),
-                ESCSEQ("ouml", "ö"),
+                ESCSEQ("ntilde", "\361"/* ñ */),
+                ESCSEQ("ograve", "\362"/* ò */),
+                ESCSEQ("oacute", "\363"/* ó */),
+                ESCSEQ("ocirc", "\364"/* ô */),
+                ESCSEQ("otilde", "\365"/* õ */),
+                ESCSEQ("ouml", "\366"/* ö */),

                 ESCSEQ("divide", " "),
                 ESCSEQ("oslash", " "),
                 ESCSEQ("divide", " "),
                 ESCSEQ("oslash", " "),

-                ESCSEQ("ugrave", "ù"),
-                ESCSEQ("uacute", "ú"),
-                ESCSEQ("ucirc", "û"),
-                ESCSEQ("uuml", "ü"),
+                ESCSEQ("ugrave", "\371"/* ù */),
+                ESCSEQ("uacute", "\372"/* ú */),
+                ESCSEQ("ucirc", "\373"/* û */),
+                ESCSEQ("uuml", "\374"/* ü */),

     
                 ESCSEQ("yuml", ""),
 
                 /* this one should ALWAYS stay the last one!!! */
                 ESCSEQ("amp", "&"),
     
                 ESCSEQ("yuml", ""),
 
                 /* this one should ALWAYS stay the last one!!! */
                 ESCSEQ("amp", "&"),

+                ESCSEQ("#38", "&"),

 
                 { NULL, NULL, NULL }
                 };
 
         for (int i = 0; substitutions[i][0] != NULL; i++) 
         {
 
                 { NULL, NULL, NULL }
                 };
 
         for (int i = 0; substitutions[i][0] != NULL; i++) 
         {

-            m_Word.Replace(substitutions[i][0], substitutions[i][2], TRUE);
-            m_Word.Replace(substitutions[i][1], substitutions[i][2], TRUE);
+            m_Word.Replace(substitutions[i][0], substitutions[i][3], TRUE);
+            m_Word.Replace(substitutions[i][1], substitutions[i][3], TRUE);
+            m_Word.Replace(substitutions[i][2], substitutions[i][3], TRUE);

         }
     }
 
         }
     }