This last it has different meaning, we don't want it to be parsed by myitems handler!
- // handler can handle only 'myitems' (e.g. it's GetSupportedTags returns "MYITEMS")
+ // handler can handle only 'myitems' (e.g. its GetSupportedTags returns "MYITEMS")
// you can call PushTagHandler(handler, "IT") when you find
// and call PopTagHandler() when you find
- void PushTagHandler(wxHtmlTagHandler *handler, wxString tags);
+ void PushTagHandler(wxHtmlTagHandler *handler, const wxString& tags);
// Restores state before last call to PushTagHandler
void PopTagHandler();
wxString* GetSource() {return &m_Source;}
void SetSource(const wxString& src);
-
- // Sets HTML source and remebers current parser's state so that it can
- // later be restored. This is useful for on-line modifications of
+
+ // Sets HTML source and remembers current parser's state so that it can
+ // later be restored. This is useful for on-line modifications of
// HTML source (for example, handler replaces spaces with
// and newlines with
)
virtual void SetSourceAndSaveState(const wxString& src);
- // Restores parser's state from stack or returns FALSE if the stack is
+ // Restores parser's state from stack or returns false if the stack is
// empty
virtual bool RestoreState();
-
+
+ // Returns HTML source inside the element (i.e. between the starting
+ // and ending tag)
+ wxString GetInnerSource(const wxHtmlTag& tag);
+
// Parses HTML string 'markup' and extracts charset info from tag
// if present. Returns empty string if the tag is missing.
// For wxHTML's internal use.
static wxString ExtractCharsetInformation(const wxString& markup);
-
+
// Returns entity parser object, used to substitute HTML &entities;
wxHtmlEntitiesParser *GetEntitiesParser() const { return m_entitiesParser; }
@@ -134,7 +133,7 @@ protected:
void CreateDOMTree();
void DestroyDOMTree();
void CreateDOMSubTree(wxHtmlTag *cur,
- int begin_pos, int end_pos,
+ int begin_pos, int end_pos,
wxHtmlTagsCache *cache);
// Adds text to the output.
@@ -159,9 +158,9 @@ protected:
size_t m_CurTextPiece;
wxString m_Source;
-
+
wxHtmlParserState *m_SavedStates;
-
+
// handlers that handle particular tags. The table is accessed by
// key = tag's name.
// This attribute MUST be filled by derived class otherwise it would
@@ -180,10 +179,10 @@ protected:
wxFileSystem *m_FS;
// handlers stack used by PushTagHandler and PopTagHandler
wxList *m_HandlersStack;
-
+
// entity parse
wxHtmlEntitiesParser *m_entitiesParser;
-
+
// flag indicating that the parser should stop
bool m_stopParsing;
};
@@ -194,7 +193,7 @@ protected:
// Each recognized tag is passed to handler which is capable
// of handling it. Each tag is handled in 3 steps:
// 1. Handler will modifies state of parser
-// (using it's public methods)
+// (using its public methods)
// 2. Parser parses source between starting and ending tag
// 3. Handler restores original state of the parser
class WXDLLIMPEXP_HTML wxHtmlTagHandler : public wxObject
@@ -208,7 +207,7 @@ public:
// NOTE : each _instance_ of handler is guaranteed to be called
// only by one parser. This means you don't have to care about
// reentrancy.
- virtual void SetParser(wxHtmlParser *parser)
+ virtual void SetParser(wxHtmlParser *parser)
{ m_Parser = parser; }
// Returns list of supported tags. The list is in uppercase and
@@ -219,16 +218,22 @@ public:
// This is hadling core method. It does all the Steps 1-3.
// To process step 2, you can call ParseInner()
- // returned value : TRUE if it called ParseInner(),
- // FALSE etherwise
+ // returned value : true if it called ParseInner(),
+ // false etherwise
virtual bool HandleTag(const wxHtmlTag& tag) = 0;
protected:
// parses input between beginning and ending tag.
// m_Parser must be set.
- void ParseInner(const wxHtmlTag& tag)
+ void ParseInner(const wxHtmlTag& tag)
{ m_Parser->DoParsing(tag.GetBeginPos(), tag.GetEndPos1()); }
+ // Parses given source as if it was tag's inner code (see
+ // wxHtmlParser::GetInnerSource). Unlike ParseInner(), this method lets
+ // you specify the source code to parse. This is useful when you need to
+ // modify the inner text before parsing.
+ void ParseInnerSource(const wxString& source);
+
wxHtmlParser *m_Parser;
DECLARE_NO_COPY_CLASS(wxHtmlTagHandler)
@@ -244,11 +249,11 @@ class WXDLLIMPEXP_HTML wxHtmlEntitiesParser : public wxObject
public:
wxHtmlEntitiesParser();
virtual ~wxHtmlEntitiesParser();
-
+
// Sets encoding of output string.
// Has no effect if wxUSE_WCHAR_T==0 or wxUSE_UNICODE==1
void SetEncoding(wxFontEncoding encoding);
-
+
// Parses entities in input and replaces them with respective characters
// (with respect to output encoding)
wxString Parse(const wxString& input);