m_InputEnc = wxFONTENCODING_ISO8859_1;
m_OutputEnc = wxFONTENCODING_DEFAULT;
#endif
+ m_whitespaceMode = Whitespace_Normal;
m_lastWordCell = NULL;
+ m_posColumn = 0;
{
int i, j, k, l, m;
return GetFS()->OpenFile(myurl, flags);
}
+#define NBSP_UNICODE_VALUE (wxChar(160))
+#if !wxUSE_UNICODE
+ #define CUR_NBSP_VALUE m_nbsp
+#else
+ #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
+#endif
+
void wxHtmlWinParser::AddText(const wxString& txt)
{
- register wxChar d;
- int templen = 0;
+#if !wxUSE_UNICODE
+ if ( m_nbsp == 0 )
+ m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
+#endif
- size_t lng = txt.length();
- if (lng+1 > m_tmpStrBufSize)
+ if ( m_whitespaceMode == Whitespace_Normal )
{
- delete[] m_tmpStrBuf;
- m_tmpStrBuf = new wxChar[lng+1];
- m_tmpStrBufSize = lng+1;
- }
- wxChar *temp = m_tmpStrBuf;
-
- wxString::const_iterator i = txt.begin();
- wxString::const_iterator end = txt.end();
+ int templen = 0;
- if (m_tmpLastWasSpace)
- {
- while ( (i < end) &&
- (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') ||
- *i == wxT('\t')) )
+ size_t lng = txt.length();
+ if (lng+1 > m_tmpStrBufSize)
{
- ++i;
+ delete[] m_tmpStrBuf;
+ m_tmpStrBuf = new wxChar[lng+1];
+ m_tmpStrBufSize = lng+1;
}
- }
+ wxChar *temp = m_tmpStrBuf;
- while (i < end)
- {
- size_t x = 0;
- d = temp[templen++] = *i;
- if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
+ wxString::const_iterator i = txt.begin();
+ const wxString::const_iterator end = txt.end();
+
+ if (m_tmpLastWasSpace)
{
- ++i, ++x;
while ( (i < end) &&
- (*i == wxT('\n') || *i == wxT('\r') ||
- *i == wxT(' ') || *i == wxT('\t')) )
+ (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') ||
+ *i == wxT('\t')) )
{
++i;
- ++x;
}
}
- else
- ++i;
- if (x)
+ while (i < end)
+ {
+ size_t x = 0;
+ const wxChar d = temp[templen++] = *i;
+ if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
+ {
+ ++i, ++x;
+ while ( (i < end) &&
+ (*i == wxT('\n') || *i == wxT('\r') ||
+ *i == wxT(' ') || *i == wxT('\t')) )
+ {
+ ++i;
+ ++x;
+ }
+ }
+ else
+ {
+ ++i;
+ }
+
+ if (x)
+ {
+ temp[templen-1] = wxT(' ');
+ FlushWordBuf(temp, templen);
+ m_tmpLastWasSpace = true;
+ }
+ }
+
+ if (templen && (templen > 1 || temp[0] != wxT(' ')))
{
- temp[templen-1] = wxT(' ');
- DoAddText(temp, templen);
- m_tmpLastWasSpace = true;
+ FlushWordBuf(temp, templen);
+ m_tmpLastWasSpace = false;
}
}
-
- if (templen && (templen > 1 || temp[0] != wxT(' ')))
+ else // m_whitespaceMode == Whitespace_Pre
{
- DoAddText(temp, templen);
+ if ( txt.find(CUR_NBSP_VALUE) != wxString::npos )
+ {
+ // we need to substitute spaces for here just like we
+ // did in the Whitespace_Normal branch above
+ wxString txt2(txt);
+ txt2.Replace(CUR_NBSP_VALUE, ' ');
+ AddPreBlock(txt2);
+ }
+ else
+ {
+ AddPreBlock(txt);
+ }
+
+ // don't eat any whitespace in <pre> block
m_tmpLastWasSpace = false;
}
}
-void wxHtmlWinParser::DoAddText(wxChar *temp, int& templen)
+void wxHtmlWinParser::FlushWordBuf(wxChar *buf, int& len)
{
- #define NBSP_UNICODE_VALUE 160
-#if !wxUSE_UNICODE
- if ( m_nbsp == 0 )
- m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
- #define CUR_NBSP_VALUE m_nbsp
-#else
- #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
-#endif
+ buf[len] = 0;
+
+ for ( int i = 0; i < len; i++ )
+ {
+ if ( buf[i] == CUR_NBSP_VALUE )
+ buf[i] = ' ';
+ }
- temp[templen] = 0;
- templen = 0;
#if !wxUSE_UNICODE
if (m_EncConv)
- m_EncConv->Convert(temp);
+ m_EncConv->Convert(buf);
#endif
- size_t len = wxStrlen(temp);
- for (size_t j = 0; j < len; j++)
- {
- if (temp[j] == CUR_NBSP_VALUE)
- temp[j] = wxT(' ');
- }
- wxHtmlCell *c = new wxHtmlWordCell(temp, *(GetDC()));
+ AddWord(wxString(buf, len));
- ApplyStateToCell(c);
+ len = 0;
+}
+
+void wxHtmlWinParser::AddWord(wxHtmlWordCell *word)
+{
+ ApplyStateToCell(word);
- m_Container->InsertCell(c);
- ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
- m_lastWordCell = (wxHtmlWordCell*)c;
+ m_Container->InsertCell(word);
+ word->SetPreviousWord(m_lastWordCell);
+ m_lastWordCell = word;
}
+void wxHtmlWinParser::AddPreBlock(const wxString& text)
+{
+ if ( text.find('\t') != wxString::npos )
+ {
+ wxString text2;
+ text2.reserve(text.length());
+
+ const wxString::const_iterator end = text.end();
+ wxString::const_iterator copyFrom = text.begin();
+ size_t pos = 0;
+ int posColumn = m_posColumn;
+ for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )
+ {
+ if ( *i == '\t' )
+ {
+ if ( copyFrom != i )
+ text2.append(copyFrom, i);
+
+ const unsigned SPACES_PER_TAB = 8;
+ const size_t expandTo = SPACES_PER_TAB - posColumn % SPACES_PER_TAB;
+ text2.append(expandTo, ' ');
+
+ posColumn += expandTo;
+ copyFrom = i + 1;
+ }
+ else
+ {
+ ++posColumn;
+ }
+ }
+ if ( copyFrom != text.end() )
+ text2.append(copyFrom, text.end());
+
+ AddWord(new wxHtmlWordWithTabsCell(text2, text, m_posColumn, *(GetDC())));
+
+ m_posColumn = posColumn;
+ }
+ else
+ {
+ // no special formatting needed
+ AddWord(text);
+ m_posColumn += text.length();
+ }
+}
wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
{
m_Container = new wxHtmlContainerCell(m_Container);
m_Container->SetAlignHor(m_Align);
+ m_posColumn = 0;
m_tmpLastWasSpace = true;
/* to avoid space being first character in paragraph */
return m_Container;
projects / wxWidgets.git / blobdiff