|
a/src/internfile/mh_html.cpp |
|
b/src/internfile/mh_html.cpp |
|
... |
|
... |
| 31 |
#include "transcode.h"
|
31 |
#include "transcode.h"
|
| 32 |
#include "mimeparse.h"
|
32 |
#include "mimeparse.h"
|
| 33 |
#include "myhtmlparse.h"
|
33 |
#include "myhtmlparse.h"
|
| 34 |
#include "indextext.h"
|
34 |
#include "indextext.h"
|
| 35 |
#include "mh_html.h"
|
35 |
#include "mh_html.h"
|
|
|
36 |
#include "smallut.h"
|
| 36 |
|
37 |
|
| 37 |
#include <iostream>
|
38 |
#include <iostream>
|
| 38 |
using namespace std;
|
39 |
using namespace std;
|
| 39 |
|
40 |
|
| 40 |
|
41 |
|
|
... |
|
... |
| 99 |
try {
|
100 |
try {
|
| 100 |
p.parse_html(transcoded);
|
101 |
p.parse_html(transcoded);
|
| 101 |
} catch (bool) {
|
102 |
} catch (bool) {
|
| 102 |
pres = p;
|
103 |
pres = p;
|
| 103 |
if (!pres.doccharset.empty() &&
|
104 |
if (!pres.doccharset.empty() &&
|
| 104 |
pres.doccharset != pres.ocharset) {
|
105 |
!samecharset(pres.doccharset, pres.ocharset)) {
|
| 105 |
LOGDEB(("textHtmlToDoc: charset '%s' doc charset '%s',"
|
106 |
LOGDEB(("textHtmlToDoc: charset '%s' doc charset '%s',"
|
| 106 |
"reparse\n", charset.c_str(),pres.doccharset.c_str()));
|
107 |
"reparse\n", charset.c_str(),pres.doccharset.c_str()));
|
| 107 |
charset = pres.doccharset;
|
108 |
charset = pres.doccharset;
|
| 108 |
} else
|
109 |
} else
|
| 109 |
break;
|
110 |
break;
|