yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

do not skip text from ePub cover files

Browse source
This commit is contained in:
Nikolay Pultsin 2013-08-10 03:06:10 +02:00
parent c9505c21f9
commit 1feb61a896
4 changed files with 61 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp
View file

@ -218,8 +218,9 @@ void XHTMLTagLinkAction::doAtStart(XHTMLReader &reader, const char **xmlattribut
return;
}
ZLLogger::Instance().println("CSS", "style file: " + reader.myPathPrefix + MiscUtil::decodeHtmlURL(href));
shared_ptr<ZLInputStream> cssStream = ZLFile(reader.myPathPrefix + MiscUtil::decodeHtmlURL(href)).inputStream();
const std::string cssFilePath = reader.myPathPrefix + MiscUtil::decodeHtmlURL(href);
ZLLogger::Instance().println("CSS", "style file: " + cssFilePath);
shared_ptr<ZLInputStream> cssStream = ZLFile(cssFilePath).inputStream();
if (cssStream.isNull()) {
return;
}
@ -307,8 +308,9 @@ void XHTMLTagImageAction::doAtStart(XHTMLReader &reader, const char **xmlattribu
endParagraph(reader);
}
const std::string imageName = imageFile.name(false);
bookReader(reader).addImageReference(imageName, 0, false);
bookReader(reader).addImageReference(imageName, 0, reader.myMarkNextImageAsCover);
bookReader(reader).addImage(imageName, new ZLFileImage(imageFile, "", 0));
reader.myMarkNextImageAsCover = false;
if (flag) {
beginParagraph(reader);
}
@ -516,6 +518,11 @@ void XHTMLReader::fillTagTable() {
}
XHTMLReader::XHTMLReader(BookReader &modelReader) : myModelReader(modelReader) {
myMarkNextImageAsCover = false;
}
void XHTMLReader::setMarkFirstImageAsCover() {
myMarkNextImageAsCover = true;
}
bool XHTMLReader::readFile(const ZLFile &file, const std::string &referenceName) {
@ -588,7 +595,6 @@ void XHTMLReader::startElementHandler(const char *tag, const char **attributes)
shared_ptr<ZLTextStyleEntry> entry = myStyleParser->parseString(style);
myModelReader.addStyleEntry(*entry);
myStyleEntryStack.push_back(entry);
} else {
}
myCSSStack.push_back(myStyleEntryStack.size() - sizeBefore);
}