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

cosmetic changes

Browse source
This commit is contained in:
Nikolay Pultsin 2014-09-11 03:00:20 +01:00
parent 0e57bacde9
commit 0dea7db853
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
jni/NativeFormats/fbreader/src/formats/html/HtmlBookReader.cpp
View file

@ -243,13 +243,12 @@ void HtmlListItemTagAction::run(const HtmlReader::HtmlTag &tag) {
bookReader().addFixedHSpace(3 * myReader.myListNumStack.size()); bookReader().addFixedHSpace(3 * myReader.myListNumStack.size());
int &index = myReader.myListNumStack.top(); int &index = myReader.myListNumStack.top();
if (index == 0) { if (index == 0) {
myReader.addConvertedDataToBuffer("\342\200\242 ", 4, false); myReader.addConvertedDataToBuffer("\342\200\242", 3, false);
} else { } else {
std::string number; const std::string number = ZLStringUtil::numberToString(index++) + ".";
ZLStringUtil::appendNumber(number, index++);
number += ". ";
myReader.addConvertedDataToBuffer(number.data(), number.length(), false); myReader.addConvertedDataToBuffer(number.data(), number.length(), false);
} }
bookReader().addFixedHSpace(1);
myReader.myDontBreakParagraph = true; myReader.myDontBreakParagraph = true;
} }
} else { } else {

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

@ -344,14 +344,12 @@ void XHTMLTagItemAction::doAtStart(XHTMLReader &reader, const char**) {
bookReader(reader).addFixedHSpace(3 * reader.myListNumStack.size()); bookReader(reader).addFixedHSpace(3 * reader.myListNumStack.size());
int &index = reader.myListNumStack.top(); int &index = reader.myListNumStack.top();
if (index == 0) { if (index == 0) {
const std::string bullet = "\xE2\x80\xA2\xC0\xA0"; static const std::string bullet = "\xE2\x80\xA2\xC0\xA0";
bookReader(reader).addData(bullet); bookReader(reader).addData(bullet);
} else { } else {
std::string number; bookReader(reader).addData(ZLStringUtil::numberToString(index++) + ".");
ZLStringUtil::appendNumber(number, index++);
number += ". ";
bookReader(reader).addData(number.data());
} }
bookReader(reader).addFixedHSpace(1);
} }
reader.myNewParagraphInProgress = true; reader.myNewParagraphInProgress = true;
} }