From 971acef0a5697bb7cbbc2b28b5faf0dc2c132160 Mon Sep 17 00:00:00 2001
From: jpirnay <jens@pirnay.com>
Date: Fri, 15 May 2026 11:44:18 +0200
Subject: [PATCH] Review comments

---
 .../Epub/parsers/ChapterHtmlSlimParser.cpp    |   6 ++++--
 scripts/generate_test_epub.py                 |   4 ++--
 test/epubs/test_jpeg_images.epub              | Bin 306767 -> 306767 bytes
 test/epubs/test_mixed_images.epub             | Bin 52139 -> 52139 bytes
 test/epubs/test_png_images.epub               | Bin 101094 -> 101094 bytes
 test/epubs/test_text_rendering.epub           | Bin 3586 -> 3568 bytes
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
index 11b39f4d..7abc5617 100644
--- a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
+++ b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
@@ -1050,13 +1050,15 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       }
     }
   } else if (strcmp(name, "hr") == 0) {
-    if (self->partWordBufferIndex > 0) self->flushPartWordBuffer();
+    if (self->partWordBufferIndex > 0) {
+      if (!self->flushPartWordBuffer()) return;
+    }
     self->makePages();
     if (!self->currentPage) {
       self->currentPage.reset(new Page());
       self->currentPageNextY = 0;
     }
-    const int lineHeight = self->renderer.getLineHeight(self->fontId) * self->lineCompression;
+    const int lineHeight = static_cast<int>(self->renderer.getLineHeight(self->fontId) * self->lineCompression + 0.5f);
     const int16_t marginV = static_cast<int16_t>(lineHeight / 2);
     self->currentPageNextY += marginV;
     if (self->currentPageNextY + 1 + marginV > self->viewportHeight) {
diff --git a/scripts/generate_test_epub.py b/scripts/generate_test_epub.py
index 126c5a09..f13bb192 100644
--- a/scripts/generate_test_epub.py
+++ b/scripts/generate_test_epub.py
@@ -1079,9 +1079,9 @@ greet("World");</code></pre>
 <p>Second rule above. Two rules in a row with no text between them:</p>
 <hr/>
 <hr/>
-<p>Two rules appeared above. Now a rule at the very start of a section (right after the heading):</p>
+<p>Two rules appeared above. Now a rule right after the heading:</p>
 <hr/>
-<p>Rule appeared right after the heading. Finally, a rule near the end of the page to verify it does not cause a spurious page break when there is still room:</p>
+<p>Rule appeared right after the paragraph above. Finally, a rule near the end of the page to verify it does not cause a spurious page break when there is still room:</p>
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 <hr/>
 <p>End of horizontal rule tests.</p>
diff --git a/test/epubs/test_jpeg_images.epub b/test/epubs/test_jpeg_images.epub
index c5f1bc2570c6a6bcf2a5e24767d3c7fac28b3038..600bdbfb0bbcbcf04cc1db23449e44226f24fbd9 100644
GIT binary patch
delta 399
zcmX?qN9g<=A)WwlW)=|!5GaqG$Ya3-B;6hW$;}#!p^PB9p6Rw3h>o$80rRV@n4`hs
zQ#rx>u4z}}K>Wn7OkjTMx7!iC<+1ByTtqdCE&<Kem@aUDNo0DWKjUMdx^}k!#_eta
zOndWzob9X!m{dW!+I0>xZPz)-d@Bef$|1sH0TSKrB+6pt0%FufvM7K>7DTc9aRrIY
zTfm|W7CF3-<t`IQWYH29O)%r^GL{~Y)b!{TEG8g&;tCcg5Pfw8ivx%jU&-PDq7zp_
z_={Jvc!T&KpnRiMEM6df-71LufmINB-qjGk|7sRbko+tt|ITU_KM-GM4MaX~4Mct?
dl>ZybcUudQ?^w&?2vUD~EsHIP=32+%3IG(jikAQY

delta 399
zcmX?qN9g<=A)WwlW)=|!5SS7&k;j4wNV+`$lAARcLm5GIJ=1M75FKMF1Ljv*F-L>N
zr*eY%UDK|{f%u7EnZW$iZ?_|Or-ZDJaS_!lx&$;=W4gcrCXwlh{)~@->e}4`7`M9x
zFzw9;a<;P`U{VF?YS%f)v|Z;Q^Q|C|D2E7(1xR$elPHUo3y4t{$)W%jSrEnY#}y<p
zZvl%kSmf|Rmb*+Kkwr^bG{KCs%UF6qQq!YXu$X}8i7Qx~K=joWEDj)Ad?kwqh)!Gy
z;V)jv;tk?|fbxx2v3P;_b*muq2UbDkc~?XD{;OF$LGrVp{5z{z{6Ku2H4yo{H4yoo
dQ2uWy-)${KzGE$mBS`(}wJf$Enrj`4D*&Oljt2k$

diff --git a/test/epubs/test_mixed_images.epub b/test/epubs/test_mixed_images.epub
index bac6c3486dc1c7524c4c4877b663eb7d2cca3cda..9c3826f6c11809d83e2b62ce296d2430574ef622 100644
GIT binary patch
delta 190
zcmZ2Ioq6?iW}X0VW)=|!5GaqG$Ya3-B;6hW$;}#!+>9XFl<Bq^ke)1L`5VOLx2hKc
zaVPlv1aZ54nWI7UgcU2KLA2EoRj{taqvyf2(Qy|LJ-On935Z&E!U;ruI^h7KOip@$
lsJfG2-hq?uARgx_FwgsxH;6X_LOq2Ds-Lz638tNP1priSM*08%

delta 190
zcmZ2Ioq6?iW}X0VW)=|!5SS7&k;j4wNV+`$lAARcxfwyUDbsB;AU#>g@;8XfZ&fb@
z;!g1S3F3D9GDm~x2`g4egJ`QGs$gA-N6&+4qvI|hdUC}H6A-oTgcFGRbix5dnVj?h
lQFSN5yaOlQK|Ib=V4n9WZxC+=gn9}QR6lJC5==Yo3IO~iNZJ4Z

diff --git a/test/epubs/test_png_images.epub b/test/epubs/test_png_images.epub
index ed3b0645d9544a797c4cf2d310d198027f738c22..4f1a548a1374b460d374f24b9c0d1a3b042f0b97 100644
GIT binary patch
delta 407
zcmaDhmF?M7Hl6@)W)=|!5GaqG$Ya3-B;6hW$;}#!!HgifmZ@F{ME?`f0P{7(R!H-f
z$F7el>3AA(1E^1D`hs*uk;xwoUxJj~G2)W~(QkYh!OGwJc7XYn8B7r4GB1~dwRfJ-
zzw#BRJqoOSdRzx1`{as;|3P{yAK4ZF>Fqm$7%f1Wwtos{Tqq1;OigE00E=wTU~Cov
ziP+RKDuYE5>lp7afkf;Z8P&jy^k&8`kks_gEsQ20TC<hW2}I|%GCF|h^{tHVAo>TC
zZ`H==4dS=ALF7-iF?xacqU{iVcsoRX36%e=ozW8{Z`c8mFYaLU1Mv?-`K+A~`G8J{
b{3Iy<E|f3d#pno9pVY-@3!)cxF}eZ(=i-e7

delta 407
zcmaDhmF?M7Hl6@)W)=|!5SS7&k;j4wNV+`$lAARcgBd||EmOS^i2f&{0p@Fnt&rxO
z60$y~q~mGC4WK@q=?l^sMJ9hVd<jx^$B0h~M8EN21S@~<+X3cRW-vjF%e-6;*4}wS
z|H@aO_9(FS>2V#5?2{`V{s-x;d}Lbyq_^(~VzdBh+Wsk+aiK7XF*Ti00W7jTgRxlz
zBw|y`s0<cKtYf^x1QM}tWK;t)(wiB(KvL5`w=kN3Xw6neClH<6%IE;1*S9jdgXkYn
zzEvBeH;CWf29ZD6#^?p&i?&1f;q4IlB~bpec1BN-ykQ4KzPN+Y55zwV<+FA|<O4b(
b@{^$ayHLJ-7o#IceNq>rEr?#&#pntEc!!X5

diff --git a/test/epubs/test_text_rendering.epub b/test/epubs/test_text_rendering.epub
index 8907acad60d6bd629078bf6eb23db6655ba293c0..74be4b31dcab7af67b255eae394a951486de2b17 100644
GIT binary patch
delta 705
zcmZpY`5?^`;LXe;!T<v0u@iYLn1H0)10cCsgE5Q|L^m*ng6ZqbZeUuTHHVR}Ja&D|
zz7vzW{xLEz{AQj!lTD#sWY7C>p6VAX?{0YHblW79b*+WMiUiAol1JM=2FvbG*l!ZO
zPtMZ&R;r-5U*VKW<C&8CKUH0?v<dRjd6=~`Zf{(Zlkzm@>aBma?X<4my=R@+)79VS
z-_PB5|Nf!O=c`?3%HJrpTe5m-@LT<^B$?w^f265y)V=on`SYWC$<rjgkA>AQ-Bh*8
z&g02^p(_<Nk~WFXp23lC?57=NiJh|b#&Vk-|HSXDU43-Xo7K`^?iC#9yzVXTAGO!T
z*Gh=>g~khClU$R%-r9E@WZ5hDTArkQ5L@>C<dNx|?w3Q}F0J&KpgW~(msa<_Q&HcI
zC9`gME#ch%bcRUbhb@QPJFhhUHYwTgNVQ&R<Drrz%QI9|vZj=D7)-17<82pvQYluj
z(PENe^wJ;GPaV5h(zNpF$D3Zh1~>Tb&F{^*dT{TPX|nQ}HA~%^Y!^f(8lU<y?*JoP
zpj*!xKF4Jue9o`*_->}16K|?rlal_*-ze>vj@Zu9ssx?yXBYl$-mrezviXsH>GQnj
z{(NsCQU89vU;4xe-e*0y%CZWjvN*MVF8lnAbIk@PPDhbm$sj-dug)owm*k?|jrb+*
z-YZfma0>b+7ntI=VEw<%pMzC4ZD4w&Semr(%2%O-3lmS5adbI8^qu=&^6C7qKd;O*
zlaM%X&sH4r^6kCXj_-rTW_?fPkDYS#{a&qQs{dF)X@~=qh&X_WX!CiFUT{K*<B9^&
zlXr2OfT$1LP9VyJ#{oo@L8u)N>KBg#dXn<s1?#Hgm0{dCc{Z;CNYh>*$6@j<UM03!
I+@KT-0OsX7!~g&Q

delta 723
zcmew$-6X>k;LXe;!T<tOLMHN9Fab%o2S9SO24ff_h;CpC1=H7=-N3XwYYrpdl#ul?
z!DW0u1eh2YL|7)zWK*aY*!w=*=37AH6}2@xE=*dsYJn&_i>MBJpP!9%|Er27+sth>
zwnfu&r!R`LI6CqEp68XHm+iXoO|D!-*xMq0UDtK*fQ+L>FV0QBfBm|8{&exLi>f|8
zJpKD?|7>lGx3zm$d}6<Suf1en$*RMVk$#s$eDb+EV|QBF+UjnX+<Yd&Xj}cdDOZF4
z1}goZwBXp|*DpA;y=JW{Dvz9MToP!S^uGAvE6Y96SG!$JuS}QN^RPjA{rec3S6^hM
zE_G@+s2@yN^m378j8*|>smudQfk~4uM$br85SG`LIUCwL{hOJiS-`EVz^Tr2x8{9I
z$;eQinD(bFIq1m6;6{I;mF)bPZxWAs*SjROzVz(B=;d)m>!n1Z4*#4eKG_qW;|?7C
z)Y)@W<7j=zwZ3P<KFa0%YfV_1&%XG3@<^EMoyGY(AFE5<Uoka-KZ9$H`po~r76%kg
zwRB!pJn`nxLeIZ96>rb`JTW0%`=;&J^qEGFb(R&|my5igc*W(co^(of1XG;byE$?u
z^FAM_Us(Nh`lEpJffW-fm#sKp%KrH8-;Z&&PcqY4Sgrf73$k4n4EZ#<qL@D{VquFy
z*R>wa+q2pXH}zz;=PJ#N_Q`whs#4$-^i3`>CI4)||8$AIi6;(mbsWFa-5O-?!O}iW
z_qL&iTdTP*pTg7QziM9jiu3e5pTD@$==JK@_3Vu^_DWsY<6-?`k=B2m7|Z<c`LJZg
z0Zdk#_j2@tla3Ep6o{U@g4+Z{-Q#uwQA#`xASwkyErU=mcpT6ZnHeuwR}QZX<KfAj
Wyb2&qtAU)L$tQS~*w%1^(l7vqt3Bxe