eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #215 from jpirnay/fix-align

Browse Source 
fix: Honor users choice for alignment
This commit is contained in:
jpirnay
2026-05-14 18:29:29 +02:00
committed by GitHub
parent e922b70744 96707206c1
commit 93db7bcfd3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
+6 -3
View File
@@ -979,7 +979,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
self->currentCssStyle = cssStyle; self->currentCssStyle = cssStyle;
auto headerBlockStyle = BlockStyle::fromCssStyle(cssStyle, emSize, CssTextAlign::Center, self->viewportWidth); auto headerBlockStyle = BlockStyle::fromCssStyle(cssStyle, emSize, CssTextAlign::Center, self->viewportWidth);
headerBlockStyle.textAlignDefined = true; headerBlockStyle.textAlignDefined = true;
if (self->embeddedStyle && cssStyle.hasTextAlign()) { if (self->embeddedStyle && cssStyle.hasTextAlign() &&
self->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None)) {
headerBlockStyle.alignment = cssStyle.textAlign; headerBlockStyle.alignment = cssStyle.textAlign;
} }
self->startNewTextBlock(headerBlockStyle); self->startNewTextBlock(headerBlockStyle);
@@ -990,7 +991,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
// Preserve paragraph break semantics for this <p>, but skip its inner text payload. // Preserve paragraph break semantics for this <p>, but skip its inner text payload.
self->currentCssStyle = cssStyle; self->currentCssStyle = cssStyle;
auto blockStyle = userAlignmentBlockStyle; auto blockStyle = userAlignmentBlockStyle;
if (self->embeddedStyle && cssStyle.hasTextAlign()) { if (self->embeddedStyle && cssStyle.hasTextAlign() &&
self->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None)) {
blockStyle.alignment = cssStyle.textAlign; blockStyle.alignment = cssStyle.textAlign;
blockStyle.textAlignDefined = true; blockStyle.textAlignDefined = true;
} }
@@ -1024,7 +1026,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
} else { } else {
self->currentCssStyle = cssStyle; self->currentCssStyle = cssStyle;
auto blockStyle = userAlignmentBlockStyle; auto blockStyle = userAlignmentBlockStyle;
if (self->embeddedStyle && cssStyle.hasTextAlign()) { if (self->embeddedStyle && cssStyle.hasTextAlign() &&
self->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None)) {
blockStyle.alignment = cssStyle.textAlign; blockStyle.alignment = cssStyle.textAlign;
blockStyle.textAlignDefined = true; blockStyle.textAlignDefined = true;
} }