X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968d6f46c8d3eb82ae00fdcf338b2f7990bf2a48..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/html/winpars.h?ds=sidebyside diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index f173ec1ba9..f155127cdf 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -19,11 +19,11 @@ #include "wx/html/htmlcell.h" #include "wx/encconv.h" -class WXDLLIMPEXP_HTML wxHtmlWindow; -class WXDLLIMPEXP_HTML wxHtmlWindowInterface; -class WXDLLIMPEXP_HTML wxHtmlWinParser; -class WXDLLIMPEXP_HTML wxHtmlWinTagHandler; -class WXDLLIMPEXP_HTML wxHtmlTagsModule; +class WXDLLIMPEXP_FWD_HTML wxHtmlWindow; +class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface; +class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser; +class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler; +class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule; //-------------------------------------------------------------------------------- @@ -41,7 +41,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser public: wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL); - ~wxHtmlWinParser(); + virtual ~wxHtmlWinParser(); virtual void InitParser(const wxString& source); virtual void DoneParser(); @@ -52,7 +52,8 @@ public: // Set's the DC used for parsing. If SetDC() is not called, // parsing won't proceed virtual void SetDC(wxDC *dc, double pixel_scale = 1.0) - { m_DC = dc; m_PixelScale = pixel_scale; } + { SetDC(dc, pixel_scale, pixel_scale); } + void SetDC(wxDC *dc, double pixel_scale, double font_scale); wxDC *GetDC() {return m_DC;} double GetPixelScale() {return m_PixelScale;} @@ -106,6 +107,8 @@ public: int GetFontSize() const {return m_FontSize;} void SetFontSize(int s); + // Try to map a font size in points to the HTML 1-7 font size range. + void SetFontPointSize(int pt); int GetFontBold() const {return m_FontBold;} void SetFontBold(int x) {m_FontBold = x;} int GetFontItalic() const {return m_FontItalic;} @@ -145,11 +148,25 @@ public: // creates font depending on m_Font* members. virtual wxFont* CreateCurrentFont(); + enum WhitespaceMode + { + Whitespace_Normal, // normal mode, collapse whitespace + Whitespace_Pre // inside
, keep whitespace as-is + }; + + // change the current whitespace handling mode + void SetWhitespaceMode(WhitespaceMode mode) { m_whitespaceMode = mode; } + WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; } + protected: - virtual void AddText(const wxChar* txt); + virtual void AddText(const wxString& txt); private: - void DoAddText(wxChar *temp, int& templen, wxChar nbsp); + void FlushWordBuf(wxChar *temp, int& len); + void AddWord(wxHtmlWordCell *word); + void AddWord(const wxString& word) + { AddWord(new wxHtmlWordCell(word, *(GetDC()))); } + void AddPreBlock(const wxString& text); bool m_tmpLastWasSpace; wxChar *m_tmpStrBuf; @@ -157,7 +174,7 @@ private: // temporary variables used by AddText wxHtmlWindowInterface *m_windowInterface; // window we're parsing for - double m_PixelScale; + double m_PixelScale, m_FontScale; wxDC *m_DC; // Device Context we're parsing for static wxList m_Modules; @@ -201,14 +218,22 @@ private: // html font sizes and faces of fixed and proportional fonts #if !wxUSE_UNICODE + wxChar m_nbsp; wxFontEncoding m_InputEnc, m_OutputEnc; // I/O font encodings wxEncodingConverter *m_EncConv; #endif + // current whitespace handling mode + WhitespaceMode m_whitespaceMode; + wxHtmlWordCell *m_lastWordCell; - DECLARE_NO_COPY_CLASS(wxHtmlWinParser) + // current position on line, in num. of characters; used to properly + // expand TABs; only updated while inside+ int m_posColumn; + + wxDECLARE_NO_COPY_CLASS(wxHtmlWinParser); }; @@ -230,12 +255,12 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler public: wxHtmlWinTagHandler() : wxHtmlTagHandler() {} - virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}; + virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted - DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler) + wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler); };