Fixes tex2rtf to search for files on current folder too. This is basically to test...

[wxWidgets.git] / utils / configtool / src / htmlparser.cpp

diff --git a/utils/configtool/src/htmlparser.cpp b/utils/configtool/src/htmlparser.cpp
index d486caad1658d3a88b9fa5cbdc1af436d7bda6f3..1552216137fb7ba511d69d73e269e136cdf55e6a 100644 (file)
--- a/utils/configtool/src/htmlparser.cpp
+++ b/utils/configtool/src/htmlparser.cpp
@@ -12,22 +12,17 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "htmlparser.h"
-#endif

 
 

-#include "wx/wx.h"
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

-#include "wx/textfile.h"

 #include "wx/wfstream.h"
 #include "wx/wfstream.h"

+#include "wx/textfile.h"

 #include "wx/txtstrm.h"
 #include "wx/txtstrm.h"

-
-#include <ctype.h>
-

 #include "htmlparser.h"
 
 /// Useful insertion operators for wxOutputStream.
 #include "htmlparser.h"
 
 /// Useful insertion operators for wxOutputStream.


@@ -106,7 +101,7 @@ bool wxSimpleHtmlParser::ParseFile(const wxString& filename)
         return ParseString(text);
     }
     else
         return ParseString(text);
     }
     else

-        return FALSE;
+        return false;

 }
 
 bool wxSimpleHtmlParser::ParseString(const wxString& str)
 }
 
 bool wxSimpleHtmlParser::ParseString(const wxString& str)


@@ -121,7 +116,7 @@ bool wxSimpleHtmlParser::ParseString(const wxString& str)
 
     bool bResult = ParseHtml(m_topLevel);
 
 
     bool bResult = ParseHtml(m_topLevel);
 

-    wxASSERT(bResult); // Failed to parse the TAGs. 
+    wxASSERT(bResult); // Failed to parse the TAGs.

                        // Hint: Check if every open tag has a close tag!
 
     return bResult;
                        // Hint: Check if every open tag has a close tag!
 
     return bResult;


@@ -131,7 +126,7 @@ bool wxSimpleHtmlParser::ParseString(const wxString& str)
 bool wxSimpleHtmlParser::ParseHtml(wxSimpleHtmlTag* parent)
 {
     if (!parent)
 bool wxSimpleHtmlParser::ParseHtml(wxSimpleHtmlTag* parent)
 {
     if (!parent)

-        return FALSE;
+        return false;

 
     while (!Eof())
     {
 
     while (!Eof())
     {


@@ -160,13 +155,13 @@ bool wxSimpleHtmlParser::ParseHtml(wxSimpleHtmlTag* parent)
                 if (IsCloseTagNeeded(tag->GetName()))
                 {
                     if (!parent->GetParent())
                 if (IsCloseTagNeeded(tag->GetName()))
                 {
                     if (!parent->GetParent())

-                        return FALSE;
+                        return false;

                     parent->GetParent()->AppendTag(tag);
                     parent->GetParent()->AppendTag(tag);

-                    return TRUE;
+                    return true;

                 }
                 else
                     parent->AppendTag(tag);
                 }
                 else
                     parent->AppendTag(tag);

-            }               
+            }

         }
         else if (IsTagStartBracket(GetChar(m_pos)))
         {
         }
         else if (IsTagStartBracket(GetChar(m_pos)))
         {


@@ -177,7 +172,7 @@ bool wxSimpleHtmlParser::ParseHtml(wxSimpleHtmlTag* parent)
             if (IsCloseTagNeeded(tag->GetName()))
             {
                 if (!ParseHtml(tag))
             if (IsCloseTagNeeded(tag->GetName()))
             {
                 if (!ParseHtml(tag))

-                    return FALSE;   // Something didn't go ok, so don't continue.
+                    return false;   // Something didn't go ok, so don't continue.

             }
         }
         else
             }
         }
         else


@@ -191,11 +186,11 @@ bool wxSimpleHtmlParser::ParseHtml(wxSimpleHtmlTag* parent)
             if(parent->GetParent())
                 parent->GetParent()->AppendTag(tag);
             else
             if(parent->GetParent())
                 parent->GetParent()->AppendTag(tag);
             else

-                parent->AppendTag(tag); // When this occurs it is probably the 
+                parent->AppendTag(tag); // When this occurs it is probably the

                                         // empty lines at the end of the file...
         }
     }
                                         // empty lines at the end of the file...
         }
     }

-    return TRUE;
+    return true;

 }
 
 // Plain text, up until an angled bracket
 }
 
 // Plain text, up until an angled bracket


@@ -203,11 +198,11 @@ bool wxSimpleHtmlParser::ParseText(wxString& text)
 {
     while (!Eof() && GetChar(m_pos) != wxT('<'))
     {
 {
     while (!Eof() && GetChar(m_pos) != wxT('<'))
     {

-        text += GetChar(m_pos);
+        text += (wxChar)GetChar(m_pos);

         m_pos ++;
     }
     DecodeSpecialChars(text);
         m_pos ++;
     }
     DecodeSpecialChars(text);

-    return TRUE;
+    return true;

 }
 
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseTagHeader()
 }
 
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseTagHeader()


@@ -218,7 +213,7 @@ wxSimpleHtmlTag* wxSimpleHtmlParser::ParseTagHeader()
         EatWhitespace();
 
         wxString word;
         EatWhitespace();
 
         wxString word;

-        ReadWord(word, TRUE);
+        ReadWord(word, true);

 
         EatWhitespace();
 
 
         EatWhitespace();
 


@@ -239,12 +234,12 @@ wxSimpleHtmlTag* wxSimpleHtmlParser::ParseTagHeader()
 
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseTagClose()
 {
 
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseTagClose()
 {

-    Matches(wxT("</"), TRUE);
+    Matches(wxT("</"), true);

 
     EatWhitespace();
 
     wxString word;
 
     EatWhitespace();
 
     wxString word;

-    ReadWord(word, TRUE);
+    ReadWord(word, true);

 
     EatWhitespace();
     m_pos ++;
 
     EatWhitespace();
     m_pos ++;


@@ -264,19 +259,19 @@ bool wxSimpleHtmlParser::ParseAttributes(wxSimpleHtmlTag* tag)
 
         if (IsString())
         {
 
         if (IsString())
         {

-            ReadString(attrName, TRUE);
+            ReadString(attrName, true);

             tag->AppendAttribute(attrName, wxEmptyString);
         }
         else if (IsNumeric(GetChar(m_pos)))
         {
             tag->AppendAttribute(attrName, wxEmptyString);
         }
         else if (IsNumeric(GetChar(m_pos)))
         {

-            ReadNumber(attrName, TRUE);
+            ReadNumber(attrName, true);

             tag->AppendAttribute(attrName, wxEmptyString);
         }
         else
         {
             // Try to read an attribute name/value pair, or at least a name
             // without the value
             tag->AppendAttribute(attrName, wxEmptyString);
         }
         else
         {
             // Try to read an attribute name/value pair, or at least a name
             // without the value

-            ReadLiteral(attrName, TRUE);
+            ReadLiteral(attrName, true);

             EatWhitespace();
 
             if (GetChar(m_pos) == wxT('='))
             EatWhitespace();
 
             if (GetChar(m_pos) == wxT('='))


@@ -285,26 +280,26 @@ bool wxSimpleHtmlParser::ParseAttributes(wxSimpleHtmlTag* tag)
                 EatWhitespace();
 
                 if (IsString())
                 EatWhitespace();
 
                 if (IsString())

-                    ReadString(attrValue, TRUE);
+                    ReadString(attrValue, true);

                 else if (!Eof() && !IsTagEndBracket(GetChar(m_pos)))
                 else if (!Eof() && !IsTagEndBracket(GetChar(m_pos)))

-                    ReadLiteral(attrValue, TRUE);
+                    ReadLiteral(attrValue, true);

             }
             if (!attrName.IsEmpty())
                 tag->AppendAttribute(attrName, attrValue);
         }
     }
             }
             if (!attrName.IsEmpty())
                 tag->AppendAttribute(attrName, attrValue);
         }
     }

-    return TRUE;
+    return true;

 }
 
 // e.g. <!DOCTYPE ....>
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseDirective()
 {
 }
 
 // e.g. <!DOCTYPE ....>
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseDirective()
 {

-    Matches(wxT("<!"), TRUE);
+    Matches(wxT("<!"), true);

 
     EatWhitespace();
 
     wxString word;
 
     EatWhitespace();
 
     wxString word;

-    ReadWord(word, TRUE);
+    ReadWord(word, true);

 
     EatWhitespace();
 
 
     EatWhitespace();
 


@@ -323,12 +318,12 @@ wxSimpleHtmlTag* wxSimpleHtmlParser::ParseDirective()
 // e.g. <?xml .... ?>
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseXMLDeclaration()
 {
 // e.g. <?xml .... ?>
 wxSimpleHtmlTag* wxSimpleHtmlParser::ParseXMLDeclaration()
 {

-    Matches(wxT("<?"), TRUE);
+    Matches(wxT("<?"), true);

 
     EatWhitespace();
 
     wxString word;
 
     EatWhitespace();
 
     wxString word;

-    ReadWord(word, TRUE);
+    ReadWord(word, true);

 
     EatWhitespace();
 
 
     EatWhitespace();
 


@@ -347,28 +342,28 @@ wxSimpleHtmlTag* wxSimpleHtmlParser::ParseXMLDeclaration()
 bool wxSimpleHtmlParser::ParseComment()
 {
     // Eat the comment tag start
 bool wxSimpleHtmlParser::ParseComment()
 {
     // Eat the comment tag start

-    Matches(wxT("<!--"), TRUE);
+    Matches(wxT("<!--"), true);

 
 

-    while (!Eof() && !Matches(wxT("-->"), TRUE))
+    while (!Eof() && !Matches(wxT("-->"), true))

     {
         m_pos ++;
     }
 
     {
         m_pos ++;
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxSimpleHtmlParser::EatWhitespace()
 {
     while (!Eof() && IsWhitespace(GetChar(m_pos)))
         m_pos ++;
 }
 
 bool wxSimpleHtmlParser::EatWhitespace()
 {
     while (!Eof() && IsWhitespace(GetChar(m_pos)))
         m_pos ++;

-    return TRUE;
+    return true;

 }
 
 bool wxSimpleHtmlParser::EatWhitespace(int& pos)
 {
     while (!Eof(pos) && IsWhitespace(GetChar(pos)))
         pos ++;
 }
 
 bool wxSimpleHtmlParser::EatWhitespace(int& pos)
 {
     while (!Eof(pos) && IsWhitespace(GetChar(pos)))
         pos ++;

-    return TRUE;
+    return true;

 }
 
 bool wxSimpleHtmlParser::ReadString(wxString& str, bool eatIt)
 }
 
 bool wxSimpleHtmlParser::ReadString(wxString& str, bool eatIt)


@@ -388,10 +383,10 @@ bool wxSimpleHtmlParser::ReadString(wxString& str, bool eatIt)
         if (eatIt)
             m_pos = pos;
         DecodeSpecialChars(str);
         if (eatIt)
             m_pos = pos;
         DecodeSpecialChars(str);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 bool wxSimpleHtmlParser::ReadWord(wxString& str, bool eatIt)
 }
 
 bool wxSimpleHtmlParser::ReadWord(wxString& str, bool eatIt)


@@ -399,7 +394,7 @@ bool wxSimpleHtmlParser::ReadWord(wxString& str, bool eatIt)
     int pos = m_pos;
 
     if (!IsAlpha(GetChar(pos)))
     int pos = m_pos;
 
     if (!IsAlpha(GetChar(pos)))

-        return FALSE;
+        return false;

 
     str += (wxChar) GetChar(pos) ;
     pos ++;
 
     str += (wxChar) GetChar(pos) ;
     pos ++;


@@ -412,7 +407,7 @@ bool wxSimpleHtmlParser::ReadWord(wxString& str, bool eatIt)
     if (eatIt)
         m_pos = pos;
     DecodeSpecialChars(str);
     if (eatIt)
         m_pos = pos;
     DecodeSpecialChars(str);

-    return TRUE;
+    return true;

 }
 
 bool wxSimpleHtmlParser::ReadNumber(wxString& str, bool eatIt)
 }
 
 bool wxSimpleHtmlParser::ReadNumber(wxString& str, bool eatIt)


@@ -420,7 +415,7 @@ bool wxSimpleHtmlParser::ReadNumber(wxString& str, bool eatIt)
     int pos = m_pos;
 
     if (!IsNumeric(GetChar(pos)))
     int pos = m_pos;
 
     if (!IsNumeric(GetChar(pos)))

-        return FALSE;
+        return false;

 
     str += (wxChar) GetChar(pos) ;
     pos ++;
 
     str += (wxChar) GetChar(pos) ;
     pos ++;


@@ -433,7 +428,7 @@ bool wxSimpleHtmlParser::ReadNumber(wxString& str, bool eatIt)
     if (eatIt)
         m_pos = pos;
     DecodeSpecialChars(str);
     if (eatIt)
         m_pos = pos;
     DecodeSpecialChars(str);

-    return TRUE;
+    return true;

 }
 
 // Could be number, string, whatever, but read up until whitespace or end of tag (but not a quoted string)
 }
 
 // Could be number, string, whatever, but read up until whitespace or end of tag (but not a quoted string)


@@ -443,13 +438,13 @@ bool wxSimpleHtmlParser::ReadLiteral(wxString& str, bool eatIt)
 
     while (!Eof(pos) && !IsWhitespace(GetChar(pos)) && !IsTagEndBracket(GetChar(pos)) && GetChar(pos) != wxT('='))
     {
 
     while (!Eof(pos) && !IsWhitespace(GetChar(pos)) && !IsTagEndBracket(GetChar(pos)) && GetChar(pos) != wxT('='))
     {

-        str += GetChar(pos);
+        str += (wxChar)GetChar(pos);

         pos ++;
     }
     if (eatIt)
         m_pos = pos;
     DecodeSpecialChars(str);
         pos ++;
     }
     if (eatIt)
         m_pos = pos;
     DecodeSpecialChars(str);

-    return TRUE;
+    return true;

 }
 
 bool wxSimpleHtmlParser::IsComment()
 }
 
 bool wxSimpleHtmlParser::IsComment()


@@ -514,37 +509,37 @@ bool wxSimpleHtmlParser::IsNumeric(int ch)
 
 bool wxSimpleHtmlParser::IsCloseTagNeeded(const wxString &name)
 {
 
 bool wxSimpleHtmlParser::IsCloseTagNeeded(const wxString &name)
 {

-    if (name.IsSameAs(wxT("P"), FALSE)) // e.g <P>
-        return FALSE;
+    if (name.IsSameAs(wxT("P"), false)) // e.g <P>
+        return false;

 
     // ToDo add more items here.
 
 
     // ToDo add more items here.
 

-    return TRUE;
+    return true;

 }
 
 // Encode/Decode Special Characters.
 // See here for the used table: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/xmlsql/ac_xml1_1nqk.asp
 /* static */ void wxSimpleHtmlParser::DecodeSpecialChars(wxString &value)
 {
 }
 
 // Encode/Decode Special Characters.
 // See here for the used table: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/xmlsql/ac_xml1_1nqk.asp
 /* static */ void wxSimpleHtmlParser::DecodeSpecialChars(wxString &value)
 {

-    // XML translation      
-    value.Replace(wxT("&gt;"),   wxT(">"),  TRUE);
-    value.Replace(wxT("&lt;"),   wxT("<"),  TRUE);
-    value.Replace(wxT("&quot;"), wxT("\""), TRUE);
-    value.Replace(wxT("&apos;"), wxT("'"),  TRUE);
-    value.Replace(wxT("&amp;"),  wxT("&"),  TRUE);    // Note: do this as last to prevent replace problems.
+    // XML translation
+    value.Replace(wxT("&gt;"),   wxT(">"),  true);
+    value.Replace(wxT("&lt;"),   wxT("<"),  true);
+    value.Replace(wxT("&quot;"), wxT("\""), true);
+    value.Replace(wxT("&apos;"), wxT("'"),  true);
+    value.Replace(wxT("&amp;"),  wxT("&"),  true);    // Note: do this as last to prevent replace problems.

 }
 
 /* static */ wxString wxSimpleHtmlParser::EncodeSpecialChars(const wxString &value)
 {
     wxString newvalue = value;
 
 }
 
 /* static */ wxString wxSimpleHtmlParser::EncodeSpecialChars(const wxString &value)
 {
     wxString newvalue = value;
 

-    // XML translation      
-    newvalue.Replace(wxT("&"), wxT("&amp;"),  TRUE);    // Note: do this as first to prevent replace problems.
-    newvalue.Replace(wxT(">"), wxT("&gt;"),   TRUE);
-    newvalue.Replace(wxT("<"), wxT("&lt;"),   TRUE);
-    newvalue.Replace(wxT("\""),wxT("&quot;"), TRUE);
-    newvalue.Replace(wxT("'"), wxT("&apos;"), TRUE);
-    
+    // XML translation
+    newvalue.Replace(wxT("&"), wxT("&amp;"),  true);    // Note: do this as first to prevent replace problems.
+    newvalue.Replace(wxT(">"), wxT("&gt;"),   true);
+    newvalue.Replace(wxT("<"), wxT("&lt;"),   true);
+    newvalue.Replace(wxT("\""),wxT("&quot;"), true);
+    newvalue.Replace(wxT("'"), wxT("&apos;"), true);
+

     return newvalue;
 }
 
     return newvalue;
 }
 


@@ -591,10 +586,10 @@ bool wxSimpleHtmlParser::WriteFile(wxString& filename)
     if (fstream.Ok())
     {
         Write(fstream);
     if (fstream.Ok())
     {
         Write(fstream);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 /*
 }
 
 /*


@@ -697,7 +692,7 @@ void wxSimpleHtmlTag::RemoveChild(wxSimpleHtmlTag *remove)
             {
                 child->m_next = NULL;
                 delete child;
             {
                 child->m_next = NULL;
                 delete child;

-                
+

                 if (prev != NULL)
                     prev->m_next = next;
                 else
                 if (prev != NULL)
                     prev->m_next = next;
                 else


@@ -723,7 +718,7 @@ void wxSimpleHtmlTag::AppendTag(wxSimpleHtmlTag* tag)
         while (last->m_next)
             last = last->m_next;
 
         while (last->m_next)
             last = last->m_next;
 

-        last->m_next = tag;        
+        last->m_next = tag;

     }
     else
     {
     }
     else
     {


@@ -819,13 +814,13 @@ bool wxSimpleHtmlTag::GetAttributeValue(wxString& value, const wxString& attrNam
     if (attr)
     {
         value = attr->GetValue();
     if (attr)
     {
         value = attr->GetValue();

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 }
 

-// Search forward from this tag until we find a tag with this name & attribute 
+// Search forward from this tag until we find a tag with this name & attribute

 wxSimpleHtmlTag* wxSimpleHtmlTag::FindTag(const wxString& tagName, const wxString& attrName)
 {
     wxSimpleHtmlTag* tag = m_next;
 wxSimpleHtmlTag* wxSimpleHtmlTag::FindTag(const wxString& tagName, const wxString& attrName)
 {
     wxSimpleHtmlTag* tag = m_next;


@@ -845,14 +840,14 @@ bool wxSimpleHtmlTag::FindTextUntilTagClose(wxString& text, const wxString& tagN
     while (tag)
     {
         if (tag->GetType() == wxSimpleHtmlTag_Close && tag->NameIs(tagName))
     while (tag)
     {
         if (tag->GetType() == wxSimpleHtmlTag_Close && tag->NameIs(tagName))

-            return TRUE;
+            return true;

 
         if (tag->GetType() == wxSimpleHtmlTag_Text)
             text += tag->GetText();
 
         tag = tag->m_next;
     }
 
         if (tag->GetType() == wxSimpleHtmlTag_Text)
             text += tag->GetText();
 
         tag = tag->m_next;
     }

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -874,7 +869,7 @@ wxSimpleHtmlTag* wxSimpleHtmlTag::GetChild(int i) const
 void wxSimpleHtmlTag::Write(wxOutputStream& stream)
 {
     // Some helpers to layout the open and close tags.
 void wxSimpleHtmlTag::Write(wxOutputStream& stream)
 {
     // Some helpers to layout the open and close tags.

-    static bool sbUseTab = TRUE;
+    static bool sbUseTab = true;

     static size_t snTabLevel = 0;
 
 #if 0 // Enable if no tabs should be used to align the tags.
     static size_t snTabLevel = 0;
 
 #if 0 // Enable if no tabs should be used to align the tags.


@@ -904,16 +899,16 @@ void wxSimpleHtmlTag::Write(wxOutputStream& stream)
                 attr->Write(stream);
                 if (i < GetAttributeCount() - 1)
                     stream << wxT(" ");
                 attr->Write(stream);
                 if (i < GetAttributeCount() - 1)
                     stream << wxT(" ");

-            }            
+            }

             if(!m_children)
             {
             if(!m_children)
             {

-                sbUseTab = FALSE;   // We're putting the open a close tag on the same line, 
+                sbUseTab = false;   // We're putting the open a close tag on the same line,

                                     // so we don't wan't any tabs
                 stream << wxT(">");
             }
             else
             {
                                     // so we don't wan't any tabs
                 stream << wxT(">");
             }
             else
             {

-                // sbUseTab = TRUE;
+                // sbUseTab = true;

                 stream << wxT(">\n");
             }
             snTabLevel++;
                 stream << wxT(">\n");
             }
             snTabLevel++;


@@ -958,7 +953,7 @@ void wxSimpleHtmlTag::Write(wxOutputStream& stream)
                     stream << wxT("\t");
             }
             stream << wxT("</") << wxSimpleHtmlParser::EncodeSpecialChars(m_name) << wxT(">\n");
                     stream << wxT("\t");
             }
             stream << wxT("</") << wxSimpleHtmlParser::EncodeSpecialChars(m_name) << wxT(">\n");

-            sbUseTab = TRUE;
+            sbUseTab = true;

             break;
         }
     default:
             break;
         }
     default: