- int fixed = m_WParser -> GetFontFixed(),
- italic = m_WParser -> GetFontItalic(),
- underlined = m_WParser -> GetFontUnderlined(),
- bold = m_WParser -> GetFontBold(),
- fsize = m_WParser -> GetFontSize();
-
- m_WParser -> CloseContainer();
- c = m_WParser -> OpenContainer();
- c -> SetAlignHor(wxHTML_ALIGN_LEFT);
- c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_VERTICAL);
-
- m_WParser -> SetFontUnderlined(FALSE);
- m_WParser -> SetFontBold(FALSE);
- m_WParser -> SetFontItalic(FALSE);
- m_WParser -> SetFontFixed(TRUE);
- m_WParser -> SetFontSize(3);
- c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-
- {
- wxString cit;
- wxEncodingConverter *encconv = m_WParser -> GetEncodingConverter();
- cit = m_WParser -> GetSource() -> Mid(tag.GetBeginPos(),
- tag.GetEndPos1() - tag.GetBeginPos());
- if (encconv)
- c -> InsertCell(new wxHtmlPRECell(encconv -> Convert(cit),
- *(m_WParser -> GetDC())));
- else
- c -> InsertCell(new wxHtmlPRECell(cit,
- *(m_WParser -> GetDC())));
- }
-
- m_WParser -> SetFontUnderlined(underlined);
- m_WParser -> SetFontBold(bold);
- m_WParser -> SetFontItalic(italic);
- m_WParser -> SetFontFixed(fixed);
- m_WParser -> SetFontSize(fsize);
- c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-
- m_WParser -> CloseContainer();
- m_WParser -> OpenContainer();
- return TRUE;
+ const int fixed = m_WParser->GetFontFixed();
+ const int italic = m_WParser->GetFontItalic();
+ const int underlined = m_WParser->GetFontUnderlined();
+ const int bold = m_WParser->GetFontBold();
+ const int fsize = m_WParser->GetFontSize();
+ const wxHtmlWinParser::WhitespaceMode whitespace =
+ m_WParser->GetWhitespaceMode();
+
+ c = m_WParser->GetContainer();
+ m_WParser->SetWhitespaceMode(wxHtmlWinParser::Whitespace_Pre);
+ m_WParser->SetFontUnderlined(false);
+ m_WParser->SetFontBold(false);
+ m_WParser->SetFontItalic(false);
+ m_WParser->SetFontFixed(true);
+ m_WParser->SetFontSize(3);
+ c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+
+ m_WParser->CloseContainer();
+ c = m_WParser->OpenContainer();
+ c->SetWidthFloat(tag);
+ c = m_WParser->OpenContainer();
+ c->SetAlignHor(wxHTML_ALIGN_LEFT);
+ c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
+
+ wxString srcMid = m_WParser->GetInnerSource(tag);
+
+ // setting Whitespace_Pre mode takes care of spaces and TABs, but
+ // not linebreaks, so we have to translate them into <br> by
+ // calling HtmlizeLinebreaks() here
+ ParseInnerSource(HtmlizeLinebreaks(srcMid));
+
+ m_WParser->CloseContainer();
+ m_WParser->CloseContainer();
+ c = m_WParser->OpenContainer();
+
+ m_WParser->SetWhitespaceMode(whitespace);
+ m_WParser->SetFontUnderlined(underlined);
+ m_WParser->SetFontBold(bold);
+ m_WParser->SetFontItalic(italic);
+ m_WParser->SetFontFixed(fixed);
+ m_WParser->SetFontSize(fsize);
+ c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+
+ return true;