X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc1efb1d9f4e4ce7d8f889dad3aaab7026b73058..70050c82fe8114fc5d86591035e71751bac21cc6:/src/html/helpdata.cpp

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 4e186d55f0..76e7264ae8 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -61,7 +61,7 @@ static char* ReadLine(char *line, char *buf)
 
 static int LINKAGEMODE IndexCompareFunc(const void *a, const void *b)
 {
-    return wxStrcmp(((wxHtmlContentsItem*)a) -> m_Name, ((wxHtmlContentsItem*)b) -> m_Name);
+    return wxStrcmp(((wxHtmlContentsItem*)a)->m_Name, ((wxHtmlContentsItem*)b)->m_Name);
 }
 
 
@@ -93,7 +93,9 @@ class HP_TagHandler : public wxHtmlTagHandler
         wxHtmlBookRecord *m_Book;
 
     public:
-        HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() {m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; m_Level = 0; }
+        HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() 
+	        { m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; 
+		      m_Level = 0; m_ID = -1; }
         wxString GetSupportedTags() { return wxT("UL,OBJECT,PARAM"); }
         bool HandleTag(const wxHtmlTag& tag);
         void WriteOut(wxHtmlContentsItem*& array, int& size);
@@ -103,20 +105,21 @@ class HP_TagHandler : public wxHtmlTagHandler
 
 bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 {
-    if (tag.GetName() == wxT("UL")) {
+    if (tag.GetName() == wxT("UL")) 
+    {
         m_Level++;
         ParseInner(tag);
         m_Level--;
         return TRUE;
     }
-    else if (tag.GetName() == wxT("OBJECT")) {
+    else if (tag.GetName() == wxT("OBJECT")) 
+    {
         m_Name = m_Page = wxEmptyString;
         ParseInner(tag);
 
-        if (!m_Page.IsEmpty())
-        /* should be 'if (tag.GetParam("TYPE") == "text/sitemap")'
-           but this works fine. Valid HHW's file may contain only two
-           object tags:
+#if 0
+         if (!m_Page.IsEmpty())
+        /* Valid HHW's file may contain only two object tags:
            
            <OBJECT type="text/site properties">
                <param name="ImageType" value="Folder">
@@ -132,9 +135,14 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
            We're interested in the latter. !m_Page.IsEmpty() is valid
            condition because text/site properties does not contain Local param
         */
+#endif
+        if (tag.GetParam(wxT("TYPE")) == wxT("text/sitemap"))
         {
             if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
-                m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
+                m_Items = (wxHtmlContentsItem*) realloc(m_Items, 
+                                       (m_ItemsCnt + wxHTML_REALLOC_STEP) * 
+                                       sizeof(wxHtmlContentsItem));
+
             m_Items[m_ItemsCnt].m_Level = m_Level;
             m_Items[m_ItemsCnt].m_ID = m_ID;
             m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];
@@ -147,8 +155,160 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 
         return TRUE;
     }
-    else { // "PARAM"
-        if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) m_Name = tag.GetParam(wxT("VALUE"));
+    else 
+    { // "PARAM"
+        if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) 
+        {
+            m_Name = tag.GetParam(wxT("VALUE"));
+            if (m_Name.Find(wxT('&')) != -1) 
+            {
+#define ESCSEQ(escape, subst)  \
+                  { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) }
+        static wxChar* substitutions[][4] =
+                        {
+                ESCSEQ("quot", "\""),
+                ESCSEQ("#34", "\""),
+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),
+                ESCSEQ("lt", "<"),
+                ESCSEQ("#60", "<"),
+                ESCSEQ("gt", ">"),
+                ESCSEQ("#62", ">"),
+
+                ESCSEQ("#94", "^"), /* ^ */
+    
+                ESCSEQ("nbsp", " "),
+                ESCSEQ("#32", " "),
+                ESCSEQ("iexcl", "!"),
+                ESCSEQ("#33", "!"),
+                ESCSEQ("cent", "¢"/* ¢ */),
+                ESCSEQ("#162", "¢"/* ¢ */),
+    
+                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", "©"), /* © */
+                ESCSEQ("#169", "©"),
+                ESCSEQ("ordf", "ª"),
+                ESCSEQ("#170", "ª"),
+                ESCSEQ("laquo", "«"), /* « */
+                ESCSEQ("#171", "«"),
+                ESCSEQ("not", "¬"),
+                ESCSEQ("#172", "¬"),
+    
+                ESCSEQ("reg", "®"), /* ® */
+                ESCSEQ("#174", "®"),
+    
+                ESCSEQ("deg", "°"), /* ° */
+                ESCSEQ("#176", "°"),
+                ESCSEQ("plusm", "±"), /* ± */
+                ESCSEQ("#177", "±"),
+    
+                ESCSEQ("acute", "´"),
+                ESCSEQ("#180", "´"),
+                ESCSEQ("macron", "¯"),
+                ESCSEQ("#175", "¯"),
+                ESCSEQ("micro", "µ"), /* µ */
+                ESCSEQ("#181", "µ"),
+                ESCSEQ("para", "¶"), /* ¶ */
+                ESCSEQ("#182", "¶"),
+    
+                ESCSEQ("ordm", "º"), /* º */
+                ESCSEQ("#186", "º"),
+                ESCSEQ("raquo", "»"), /* » */
+                ESCSEQ("#187", "»"),
+    
+                ESCSEQ("iquest", "¿"), /* ¿ */
+                ESCSEQ("#191", "¿"),
+                ESCSEQ("Agrave", "\300"/* À */),
+                ESCSEQ("#193", "\300"/* À */),
+    
+                ESCSEQ("Acirc", "\302"/* Â */),
+                ESCSEQ("Atilde", "\303"/* Ã */),
+                ESCSEQ("Auml", "\304"/* Ä */),
+                ESCSEQ("Aring", " "),
+                ESCSEQ("AElig", " "),
+                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", "\321"/* Ñ */),
+                ESCSEQ("Ograve", "\322"/* Ò */),
+    
+                ESCSEQ("Ocirc", "\324"/* Ô */),
+                ESCSEQ("Otilde", "\325"/* Õ */),
+                ESCSEQ("Ouml", "\326"/* Ö */),
+    
+                ESCSEQ("Oslash", " "),
+                ESCSEQ("Ugrave", "\331"/* Ù */),
+    
+                ESCSEQ("Ucirc", " "),
+                ESCSEQ("Uuml", "\334"/* Ü */),
+    
+                ESCSEQ("szlig", "\247"/* § */),
+                ESCSEQ("agrave","\340"/* à */),
+                ESCSEQ("aacute", "\341"/* á */),
+                ESCSEQ("acirc", "\342"/* â */),
+                ESCSEQ("atilde", "\343"/* ã */),
+                ESCSEQ("auml", "\344"/* ä */),
+                ESCSEQ("aring", "a"),
+                ESCSEQ("aelig", "ae"),
+                ESCSEQ("ccedil", "\347"/* ç */),
+                ESCSEQ("egrave", "\350"/* è */),
+                ESCSEQ("eacute", "\351"/* é */),
+                ESCSEQ("ecirc", "\352"/* ê */),
+                ESCSEQ("euml", "\353"/* ë */),
+                ESCSEQ("igrave", "\354"/* ì */),
+                ESCSEQ("iacute", "\355"/* í */),
+                ESCSEQ("icirc", " "),
+                ESCSEQ("iuml", "\357"/* ï */),
+                ESCSEQ("eth", " "),
+                ESCSEQ("ntilde", "\361"/* ñ */),
+                ESCSEQ("ograve", "\362"/* ò */),
+                ESCSEQ("oacute", "\363"/* ó */),
+                ESCSEQ("ocirc", "\364"/* ô */),
+                ESCSEQ("otilde", "\365"/* õ */),
+                ESCSEQ("ouml", "\366"/* ö */),
+                ESCSEQ("divide", " "),
+                ESCSEQ("oslash", " "),
+                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("#38", "&"),
+
+                { NULL, NULL, NULL }
+                };
+
+                for (int i = 0; substitutions[i][0] != NULL; i++)
+                {
+                    m_Name.Replace(substitutions[i][0], substitutions[i][3], TRUE);
+                    m_Name.Replace(substitutions[i][1], substitutions[i][3], TRUE);
+                    m_Name.Replace(substitutions[i][2], substitutions[i][3], TRUE);
+                }
+            }
+        }
         if (tag.GetParam(wxT("NAME")) == wxT("Local")) m_Page = tag.GetParam(wxT("VALUE"));
         if (tag.GetParam(wxT("NAME")) == wxT("ID")) tag.ScanParam(wxT("VALUE"), wxT("%i"), &m_ID);
         return FALSE;
@@ -178,6 +338,16 @@ void HP_TagHandler::ReadIn(wxHtmlContentsItem* array, int size)
 // wxHtmlHelpData
 //-----------------------------------------------------------------------------
 
+wxString wxHtmlBookRecord::GetFullPath(const wxString &page) const
+{
+    if (wxIsAbsolutePath(page))
+        return page;
+    else
+        return m_BasePath + page;
+}
+
+
+
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject)
 
 wxHtmlHelpData::wxHtmlHelpData()
@@ -195,15 +365,19 @@ wxHtmlHelpData::~wxHtmlHelpData()
     int i;
 
     m_BookRecords.Empty();
-    if (m_Contents) {
-        for (i = 0; i < m_ContentsCnt; i++) {
+    if (m_Contents) 
+    {
+        for (i = 0; i < m_ContentsCnt; i++) 
+	    {
             delete[] m_Contents[i].m_Page;
             delete[] m_Contents[i].m_Name;
         }
         free(m_Contents);
     }
-    if (m_Index) {
-        for (i = 0; i < m_IndexCnt; i++) {
+    if (m_Index) 
+    {
+        for (i = 0; i < m_IndexCnt; i++) 
+	    {
             delete[] m_Index[i].m_Page;
             delete[] m_Index[i].m_Name;
         }
@@ -223,34 +397,36 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
     parser.AddTagHandler(handler);
 
     f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
-    if (f) {
-        sz = f -> GetStream() -> GetSize();
+    if (f) 
+    {
+        sz = f->GetStream()->GetSize();
         buf = new char[sz + 1];
         buf[sz] = 0;
-        f -> GetStream() -> Read(buf, sz);
+        f->GetStream()->Read(buf, sz);
         delete f;
-        handler -> ReadIn(m_Contents, m_ContentsCnt);
+        handler->ReadIn(m_Contents, m_ContentsCnt);
         parser.Parse(buf);
-        handler -> WriteOut(m_Contents, m_ContentsCnt);
+        handler->WriteOut(m_Contents, m_ContentsCnt);
         delete[] buf;
     }
     else
-        wxLogError(_("Cannot open contents file: %s"), contentsfile.mb_str());
+        wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
 
     f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
-    if (f) {
-        sz = f -> GetStream() -> GetSize();
+    if (f) 
+    {
+        sz = f->GetStream()->GetSize();
         buf = new char[sz + 1];
         buf[sz] = 0;
-        f -> GetStream() -> Read(buf, sz);
+        f->GetStream()->Read(buf, sz);
         delete f;
-        handler -> ReadIn(m_Index, m_IndexCnt);
+        handler->ReadIn(m_Index, m_IndexCnt);
         parser.Parse(buf);
-        handler -> WriteOut(m_Index, m_IndexCnt);
+        handler->WriteOut(m_Index, m_IndexCnt);
         delete[] buf;
     }
     else if (!indexfile.IsEmpty())
-        wxLogError(_("Cannot open index file: %s"), indexfile.mb_str());
+        wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
     return TRUE;
 }
 
@@ -259,13 +435,13 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
 
 #if wxUSE_UNICODE
 
-#define READ_STRING(f, s, lng) { char tmpc; for (int i = 0; i < lng; i++) { f -> Read(&tmpc, 1); s[i] = (wxChar)tmpc;} }
-#define WRITE_STRING(f, s, lng) { char tmpc; for (int i = 0; i < lng; i++) { tmpc = (char)s[i]; f -> Write(&tmpc, 1);} }
+#define READ_STRING(f, s, lng) { char tmpc; for (int i = 0; i < lng; i++) { f->Read(&tmpc, 1); s[i] = (wxChar)tmpc;} }
+#define WRITE_STRING(f, s, lng) { char tmpc; for (int i = 0; i < lng; i++) { tmpc = (char)s[i]; f->Write(&tmpc, 1);} }
 
 #else
 
-#define READ_STRING(f, s, lng) f -> Read(s, lng * sizeof(char));
-#define WRITE_STRING(f, s, lng) f -> Write(s, lng * sizeof(char));
+#define READ_STRING(f, s, lng) f->Read(s, lng * sizeof(char));
+#define WRITE_STRING(f, s, lng) f->Write(s, lng * sizeof(char));
 
 #endif
 
@@ -280,7 +456,7 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 
     /* load header - version info : */
 
-    f -> Read(&x, sizeof(x));
+    f->Read(&x, sizeof(x));
     version = wxINT32_SWAP_ON_BE(x);
     
     if (version != CURRENT_CACHED_BOOK_VERSION) 
@@ -292,21 +468,22 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
     
     /* load contents : */
 
-    f -> Read(&x, sizeof(x));
+    f->Read(&x, sizeof(x));
     st = m_ContentsCnt;
     m_ContentsCnt += wxINT32_SWAP_ON_BE(x);
     m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, 
                                                (m_ContentsCnt / wxHTML_REALLOC_STEP + 1) * 
                                                wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
-    for (i = st; i < m_ContentsCnt; i++) {
-        f -> Read(&x, sizeof(x));
+    for (i = st; i < m_ContentsCnt; i++) 
+    {
+        f->Read(&x, sizeof(x));
         m_Contents[i].m_Level = wxINT32_SWAP_ON_BE(x);
-        f -> Read(&x, sizeof(x));
+        f->Read(&x, sizeof(x));
         m_Contents[i].m_ID = wxINT32_SWAP_ON_BE(x);
-        f -> Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
+        f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
         m_Contents[i].m_Name = new wxChar[x];
         READ_STRING(f, m_Contents[i].m_Name, x);
-        f -> Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
+        f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
         m_Contents[i].m_Page = new wxChar[x];
         READ_STRING(f, m_Contents[i].m_Page, x);
         m_Contents[i].m_Book = book;
@@ -314,16 +491,17 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 
     /* load index : */
 
-    f -> Read(&x, sizeof(x));
+    f->Read(&x, sizeof(x));
     st = m_IndexCnt;
     m_IndexCnt += wxINT32_SWAP_ON_BE(x);
     m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / wxHTML_REALLOC_STEP + 1) * 
                                                      wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
-    for (i = st; i < m_IndexCnt; i++) {
-        f -> Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
+    for (i = st; i < m_IndexCnt; i++) 
+    {
+        f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
         m_Index[i].m_Name = new wxChar[x];
         READ_STRING(f, m_Index[i].m_Name, x);
-        f -> Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
+        f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
         m_Index[i].m_Page = new wxChar[x];
         READ_STRING(f, m_Index[i].m_Page, x);
         m_Index[i].m_Book = book;
@@ -340,25 +518,26 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
     /* save header - version info : */
 
     x = wxINT32_SWAP_ON_BE(CURRENT_CACHED_BOOK_VERSION);
-    f -> Write(&x, sizeof(x));
+    f->Write(&x, sizeof(x));
 
     /* save contents : */
 
     x = 0;
     for (i = 0; i < m_ContentsCnt; i++) if (m_Contents[i].m_Book == book && m_Contents[i].m_Level > 0) x++;
     x = wxINT32_SWAP_ON_BE(x);
-    f -> Write(&x, sizeof(x));
-    for (i = 0; i < m_ContentsCnt; i++) {
+    f->Write(&x, sizeof(x));
+    for (i = 0; i < m_ContentsCnt; i++) 
+    {
         if (m_Contents[i].m_Book != book || m_Contents[i].m_Level == 0) continue;
         x = wxINT32_SWAP_ON_BE(m_Contents[i].m_Level);
-        f -> Write(&x, sizeof(x));
+        f->Write(&x, sizeof(x));
         x = wxINT32_SWAP_ON_BE(m_Contents[i].m_ID);
-        f -> Write(&x, sizeof(x));
+        f->Write(&x, sizeof(x));
         x = wxINT32_SWAP_ON_BE(wxStrlen(m_Contents[i].m_Name) + 1);
-        f -> Write(&x, sizeof(x));
+        f->Write(&x, sizeof(x));
         WRITE_STRING(f, m_Contents[i].m_Name, x);
         x = wxINT32_SWAP_ON_BE(wxStrlen(m_Contents[i].m_Page) + 1);
-        f -> Write(&x, sizeof(x));
+        f->Write(&x, sizeof(x));
         WRITE_STRING(f, m_Contents[i].m_Page, x);
     }
 
@@ -367,14 +546,15 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
     x = 0;
     for (i = 0; i < m_IndexCnt; i++) if (m_Index[i].m_Book == book && m_Index[i].m_Level > 0) x++;
     x = wxINT32_SWAP_ON_BE(x);
-    f -> Write(&x, sizeof(x));
-    for (i = 0; i < m_IndexCnt; i++) {
+    f->Write(&x, sizeof(x));
+    for (i = 0; i < m_IndexCnt; i++) 
+    {
         if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0) continue;
         x = wxINT32_SWAP_ON_BE(wxStrlen(m_Index[i].m_Name) + 1);
-        f -> Write(&x, sizeof(x));
+        f->Write(&x, sizeof(x));
         WRITE_STRING(f, m_Index[i].m_Name, x);
         x = wxINT32_SWAP_ON_BE(wxStrlen(m_Index[i].m_Page) + 1);
-        f -> Write(&x, sizeof(x));
+        f->Write(&x, sizeof(x));
         WRITE_STRING(f, m_Index[i].m_Page, x);
     }
     return TRUE;
@@ -384,7 +564,8 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
 void wxHtmlHelpData::SetTempDir(const wxString& path)
 {
     if (path == wxEmptyString) m_TempPath = path;
-    else {
+    else 
+    {
         if (wxIsAbsolutePath(path)) m_TempPath = path;
         else m_TempPath = wxGetCwd() + _T("/") + path;
 
@@ -444,14 +625,14 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     fi = fsys.OpenFile(bookfile.GetLocation() + wxT(".cached"));
     
     if (fi == NULL || 
-          fi -> GetModificationTime() < bookfile.GetModificationTime() || 
-          !LoadCachedBook(bookr, fi -> GetStream()))
+          fi->GetModificationTime() < bookfile.GetModificationTime() || 
+          !LoadCachedBook(bookr, fi->GetStream()))
     {
         if (fi != NULL) delete fi;
         fi = fsys.OpenFile(m_TempPath + wxFileNameFromPath(bookfile.GetLocation()) + wxT(".cached"));
         if (m_TempPath == wxEmptyString || fi == NULL || 
-            fi -> GetModificationTime() < bookfile.GetModificationTime() || 
-            !LoadCachedBook(bookr, fi -> GetStream()))
+            fi->GetModificationTime() < bookfile.GetModificationTime() || 
+            !LoadCachedBook(bookr, fi->GetStream()))
         {
             LoadMSProject(bookr, fsys, indexfile, contfile);
             if (m_TempPath != wxEmptyString) 
@@ -538,16 +719,16 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
 
         fi = fsys.OpenFile(bookFull);
         if (fi == NULL) 
-	{
-	    wxLogError(_("Cannot open HTML help book: %s"), bookFull.mb_str());
-	    return FALSE;
-	}
+        {
+            wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
+            return FALSE;
+        }
         fsys.ChangePathTo(bookFull);
-        s = fi -> GetStream();
-        sz = s -> GetSize();
+        s = fi->GetStream();
+        sz = s->GetSize();
         buff = new char[sz + 1];
         buff[sz] = 0;
-        s -> Read(buff, sz);
+        s->Read(buff, sz);
         lineptr = buff;
 
         do {
@@ -568,7 +749,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
     
         wxFontEncoding enc;
         if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
-        else enc = wxTheFontMapper -> CharsetToEncoding(charset);
+        else enc = wxTheFontMapper->CharsetToEncoding(charset);
         bool rtval = AddBookParam(*fi, enc, 
                                   title, contents, index, start, fsys.GetPath());
         delete fi;
@@ -587,10 +768,12 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     /* 1. try to open given file: */
 
     cnt = m_BookRecords.GetCount();
-    for (i = 0; i < cnt; i++) {
-        f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x);
-        if (f) {
-            url = m_BookRecords[i].GetBasePath() + x;
+    for (i = 0; i < cnt; i++) 
+    {
+        f = fsys.OpenFile(m_BookRecords[i].GetFullPath(x));
+        if (f) 
+	    {
+            url = m_BookRecords[i].GetFullPath(x);
             delete f;
             return url;
         }
@@ -599,9 +782,11 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
 
     /* 2. try to find a book: */
 
-    for (i = 0; i < cnt; i++) {
-        if (m_BookRecords[i].GetTitle() == x) {
-            url = m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart();
+    for (i = 0; i < cnt; i++) 
+    {
+        if (m_BookRecords[i].GetTitle() == x) 
+	    {
+            url = m_BookRecords[i].GetFullPath(m_BookRecords[i].GetStart());
             return url;
         }
     }
@@ -609,9 +794,11 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     /* 3. try to find in contents: */
 
     cnt = m_ContentsCnt;
-    for (i = 0; i < cnt; i++) {
-        if (wxStrcmp(m_Contents[i].m_Name, x) == 0) {
-            url = m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page;
+    for (i = 0; i < cnt; i++) 
+    {
+        if (wxStrcmp(m_Contents[i].m_Name, x) == 0) 
+	    {
+            url = m_Contents[i].GetFullPath();
             return url;
         }
     }
@@ -620,9 +807,11 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     /* 4. try to find in index: */
 
     cnt = m_IndexCnt;
-    for (i = 0; i < cnt; i++) {
-        if (wxStrcmp(m_Index[i].m_Name, x) == 0) {
-            url = m_Index[i].m_Book -> GetBasePath() + m_Index[i].m_Page;
+    for (i = 0; i < cnt; i++) 
+    {
+        if (wxStrcmp(m_Index[i].m_Name, x) == 0) 
+	    {
+            url = m_Index[i].GetFullPath();
             return url;
         }
     }
@@ -635,9 +824,11 @@ wxString wxHtmlHelpData::FindPageById(int id)
     int i;
     wxString url(wxEmptyString);
 
-    for (i = 0; i < m_ContentsCnt; i++) {
-        if (m_Contents[i].m_ID == id) {
-            url = m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page;
+    for (i = 0; i < m_ContentsCnt; i++) 
+    {
+        if (m_Contents[i].m_ID == id) 
+	    {
+            url = m_Contents[i].GetFullPath();
             return url;
         }
     }
@@ -656,11 +847,13 @@ wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& key
     m_Data = data;
     m_Keyword = keyword;
     wxHtmlBookRecord* bookr = NULL;
-    if (book != wxEmptyString) {
+    if (book != wxEmptyString) 
+    {
         // we have to search in a specific book. Find it first
         int i, cnt = data->m_BookRecords.GetCount();
         for (i = 0; i < cnt; i++)
-            if (data->m_BookRecords[i].GetTitle() == book) {
+            if (data->m_BookRecords[i].GetTitle() == book) 
+	        {
                 bookr = &(data->m_BookRecords[i]);
                 m_CurIndex = bookr->GetContentsStart();
                 m_MaxIndex = bookr->GetContentsEnd();
@@ -669,7 +862,8 @@ wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& key
         // check; we won't crash if the book doesn't exist, but it's Bad Anyway.
         wxASSERT(bookr);
     }
-    if (! bookr) {
+    if (! bookr) 
+    {
         // no book specified; search all books
         m_CurIndex = 0;
         m_MaxIndex = m_Data->m_ContentsCnt;
@@ -686,7 +880,8 @@ bool wxHtmlSearchStatus::Search()
     bool found = FALSE;
     wxChar *thepage;
 
-    if (!m_Active) {
+    if (!m_Active) 
+    {
         // sanity check. Illegal use, but we'll try to prevent a crash anyway
         wxASSERT(m_Active);
         return FALSE;
@@ -712,10 +907,11 @@ bool wxHtmlSearchStatus::Search()
     else m_LastPage = thepage;
     
     wxFileSystem fsys;
-    file = fsys.OpenFile(m_Data->m_Contents[i].m_Book -> GetBasePath() + thepage);
+    file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetFullPath(thepage));
     if (file) 
     {
-        if (m_Engine.Scan(file -> GetStream())) {
+        if (m_Engine.Scan(file->GetStream())) 
+        {
             m_Name = m_Data->m_Contents[i].m_Name;
             m_ContentsItem = m_Data->m_Contents + i;
             found = TRUE;
@@ -745,9 +941,13 @@ void wxSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool
     wxStrcpy(m_Keyword, keyword.c_str());
     
     if (!m_CaseSensitive)
+    {
         for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--)
+	    {
             if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z')))
                 m_Keyword[i] += wxT('a') - wxT('A');
+		}
+	}
 }
 
 
@@ -763,7 +963,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
     int wrd = wxStrlen(m_Keyword);
     bool found = FALSE;
     char *buf = new char[lng + 1];
-    stream -> Read(buf, lng);
+    stream->Read(buf, lng);
     buf[lng] = 0;
 
     if (!m_CaseSensitive)
@@ -772,20 +972,22 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
 
     if (m_WholeWords)
     {
-        for (i = 0; i < lng - wrd; i++) {
+        for (i = 0; i < lng - wrd; i++) 
+	    {
             if (WHITESPACE(buf[i])) continue;
             j = 0;
             while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
-            if (j == wrd && WHITESPACE(buf[i + j])) {found = TRUE; break; }
+            if (j == wrd && WHITESPACE(buf[i + j])) { found = TRUE; break; }
         }
     }
     
     else
     {
-        for (i = 0; i < lng - wrd; i++) {
+        for (i = 0; i < lng - wrd; i++) 
+	    {
             j = 0;
             while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
-            if (j == wrd) {found = TRUE; break; }
+            if (j == wrd) { found = TRUE; break; }
         }
     }
 
@@ -795,5 +997,4 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
 
 
 
-
 #endif