From ba9a4629e9f1e2fef1058111f726886e7f1fc397 Mon Sep 17 00:00:00 2001 From: Eric Lapouyade Date: Sun, 9 May 2021 12:36:28 +0200 Subject: [PATCH] PR #351 --- CHANGES.rst | 4 ++++ docxtpl/__init__.py | 2 +- tests/richtext.py | 3 ++- tests/templates/replace_picture_tpl.docx | Bin 61041 -> 63168 bytes 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index e7fcb37..2ace08a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,7 @@ +0.11.5 (2021-05-09) +------------------- +- PR #351 + 0.11.4 (2021-04-06) ------------------- - It is now possible to put InlineImage in header/footer diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py index 921991a..bafd6a0 100644 --- a/docxtpl/__init__.py +++ b/docxtpl/__init__.py @@ -4,7 +4,7 @@ Created : 2015-03-12 @author: Eric Lapouyade """ -__version__ = '0.11.4' +__version__ = '0.11.5' import functools import io diff --git a/tests/richtext.py b/tests/richtext.py index 5304abb..a3f38cb 100644 --- a/tests/richtext.py +++ b/tests/richtext.py @@ -28,7 +28,8 @@ rt.add('\nEt voilĂ  ! ') rt.add('\n1st line') rt.add('\n2nd line') rt.add('\n3rd line') -rt.add('\n\n') +rt.add('\aA new paragraph : \a') +rt.add('--- A page break here (see next page) ---\f') for ul in ['single', 'double', 'thick', 'dotted', 'dash', 'dotDash', 'dotDotDash', 'wave']: rt.add('\nUnderline : ' + ul + ' \n', underline=ul) diff --git a/tests/templates/replace_picture_tpl.docx b/tests/templates/replace_picture_tpl.docx index 3d76d9822be3f26adf8495ca967daa0169905ea5..fe8679009d2a2310b5ee593efaa7f2783ef6ad59 100644 GIT binary patch delta 12787 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 Z+;BpH1^o`0|En2vfZDqOt6cq6`d@_O4X*$I delta 10630 zcmZvCWmFx@(l)ShcMlNU-QC?GxD(uiTQ=^#aY=A@x8UyX?m>e)e4KOFz307meeZz)(Gr;8<07F?00Er0(4F(Ga2KE_@w*!2!s0M=y0{BJ2W|tZD7t<+_ zxs|bIhDcU>=camx$?5f2=bW^{c#b4*g-DUL19!&aVRl)DkXXnUBGBD;`8l~sbyt5m9&6#fGEdF>sZRL%OvN|R zvgDZ3XOxA;2D0Es@RHko^nE@}LQqAD^z{3+q7KA+rfE-E9kBmC8w!P0y9<0CkC13c zaC^RzheOlt`%X{c=a6ml(--~&#l^V}s$S;JBdgfcBqZ<9jyeB&rxfW0?0a$nNaq~O zi}+CT>M#1-6jHmVKB9Pd0P{W!x46lwbr{kgeF*ZL=W(Hxn^5r{y8fp>4ks;PoD*vI zkvP>HkSFe5hR8%$MSfz|gfyi@w!9NR#Kj2$c@G>?Yc{nCo}`bz-n*xNhX8d0aKW$Z zRscj0z^H^(S%3&)$OY7<@sKaqDm>}T@`iMdJLw4^DD4#79eFH&rQ=r~Nvraz!NJYp zsM114V8$F@5kGX5vG#oSQihS#rj3VPQzVSC_K8_CMzLbzd2i_>rc zS)U94JG}YD(r7r=5R9?IGNTEtt<1o;Xlt5VdVE{vNs6p^lX7^@Evwx5Tk&_p$e3Vy zxE#3f$!j0iOn{C7ipz4Y=U^2d@n>y%Y+vtZvA{YeOHd~O8>(B(o=B+92#Ez8IIh^s zj2d(y-7dDr=cJnbQY^y+TcQbzuF17bj$QLFwkbl-}*l9sN60gTs4WhsM%tDdi%x4io==<=XwP(v%4$`^J+s)%P5iQ^aS~rFRH*pb4*G_^&3k{a9aPvB~lFJ=5O^f)W zc2V7SRN-a-1CopWME7keJ1IkU*V?LIuAsZ$is9>9CdM^s)gr?f;|l92PFLO#T^-Jf z`M|L{cWBe%{GRNN6YwST990;-W~C+)&MvEg0xHFtB4nv1AT$ zricIAR;DwA0o{?M?L^Ay<@ZgwyEpcHRR|bwjCYa6&q?8t>T{i_NBVo<1R?>t?68>b z+uE}kW3~6h_4gYwFS=Z0g(YjjLu=JZc-M#PALe|<_??A18o-eivr*E^z#RG4F?jS{ zI^%+#mEe$^+p^@cHXWGXiDKbw{7~2f@KmRI;sEpD;meo=*Y&VP1R=j%D&7tonry%L zkj1VQ^KNV{cmG^T2b?_odN1c!5;cOu?Cp7FpIdp}!g>qIJkF>t=PK<+b;9tWYoB3{ zH4KHaJUC&qKd;9LJ&Tk3#c{Kv< zzibRTrX4jZkd0Ww#Xo%sFq?TK<|fPic4Niy)Cj~^p%Rf;C*PS?Yf2Zq%e&sV^dvOZ zZ1wRX;j6ahhmLh9ZLmbE4r`4JQ@Ka0L3^#z$bJ8$L&;V@j@J7L;qXc`m!r2+7h_J*`28X`??MQt4G8R{q3V zAOuX&OfO?)8y=}mVi|URGAwJ@9^tsp9546r2W+dttuf2~!5Qm0nxC2Tp$6BZz|Voj zg{X(`MM{lFt53L7LHyl9VV)@G9GNb)F`K%a&u{V+|C)YFea`P>$>Gae@Yx>X@spNh zEj~uU8kI_Zf6^ER^1YL-YRejMcfRgm&E& zgD_@NDW-~%$(YS+WcbxVTH9}FFy-deGG3nL+#u5+(K7_<-En5Oq5HXRmx!U;%vJ?n z=5|-wyXtbd==(%}GmEY({%bK#3Nc}6jOi_RnkPF6c!)&8@tTOpQHK@67DH!(Zw+fN zB35}0B-GQiRZ}1G=aO6%$)YD{QGW!(66p88{?eH6{8wHW3E*I0){vkL6kOn#+NgaG zGitl$v54$9Jg8UQMCorYL;*;0> zLwWlWAdYpuIr*ptw*@s-=>Z(-nR86@6{%0bqc&wuFw)=X@MYI1;$C^syem`)hHkZPA|iAzVziod*JT$b|-d35|kqX&J4y=`4=L*{q;bJ&1stcS7_IQKNYR zT+zxuMIEstL8c=sq=fXOp2lgW;DjP6<+2Ixp4bfh3)Yb_FK!&V73Zd+hdPnz9JDV{ zwu*Z3WA=JJ?Pi29Vf*FC5LK|ToeYUlqJ><6HFlW1S{Qy){h7%70+QBsC^<}&E}J*N z7uwiBxEc2KM*+$xa#xfqrh>PXE1qTUaCSiF!@vH6Arm1#K_4di3JK~!#{rJ1uiE#L zAo~8S2Znh#$P`ti=N76J*iX(f5_iE`O@onX)Q#7;ONb(N1F zH7pN`jDkf>kreCvfSOG?=`HsIirki?0X`tv5P@GK*F1QZ+2qk|{lYBM34DK)LvdAw z_2n2t$RwJbukPY)wxY2qUGPdU;BCNmn`WN+3g1UU(3`@)y36({mhCOBIM;rOY2Zew zc&gQPOmgiCz7MPP-W}o|RoW-Q$E6tvbC!Mh!S*FLjh#$k4H!dwO&rSAzdbF;6|D~Q zc`0(=IHk4`);m(%Kc2}WbkJ4Ad~W# z8L>Y9hmD>?w?Ax@0;~C#jd&|72S?TNP>mG8L{kuWL+%Mn#x{bqT#h<=H=X1OVKDNo zTGzc55oJ)0P7UD&bgtm0mqKp%>4oaNv0R&g8PH&0Dgsoe0TTuYZ~2rOqMYjo#!J>1**#!n}#%`@k?=7{3s zP@$Z%(YfMKl}nPE6ETP>lp!UKHMhpc&b_D%K>5+x0Z(zK6E6p^K!=SngN|=NCi5dd zSQ*cmyJH+1BGT|lKzfkf#X>dEcw9_%o4hNED*sF&{HD^j{dvNyy^<6i1M&o;C1%wi zU%j=Xp4=CA;EGg92Ey5t(WHFqOOTv@SEw+Tx!h>O%CTyc)lLrNps*Y6>kATU8xN7% zPY(i~TOt5)-Riq8EJm|Tyu2Z+*cuDa@=giu~o26KnG;9)%ALna3w!H|nE{h&FgK-eX z-puUf;>}n;FAd}(i8RdWy=Q9BAYk0^Bb5Zb^3=OocK%dhA~Bt4q}#RuGb}Uvg9o3R z6UI1hGKSGWyhmE?BHbQ!^6D;u|^jc6j9Q)7(Pb0eVkbRpsDhh zR)11vRNt}&BANUs9VbY62hxTS>&Bb*+Z0z}s@aCq-Vy3zKob-&F_v~~epp{>ON5*< zLc_5GyC2yx)Ole$cLsiuy(%Fs6hvNb&PZvtMl=BPrM->Y>18z|UzzK=+6D7MvJcHU zWm|kZj$Hh+z~DVx$<#S=L5#k8F;nxNY4Ex7TzCBpxft)aT&qUQjDf8btE7o7he1xh zCY8`S+KQ$j|HvR9w)5f&oSD|TZ=Ujr9p)9!G;63`4CE>K~8fB zVToUC?BS=H_HJx&X*CK~-Iv(i;zg%lY10>34$bzkH!mc)70apt>EdRm-rtBtG4u2* zOSkye#!+99zjqCbx^EWtIo%J>Z($>SiZ=((wV)JzMwe{>s`;Cyzv%OrV;x^_9jI>XQ^y_%!a7R!|(1$PHe@=oB&>kf!l(eEH~tCx#9X|Xw)>ezQQitNR$JfQ zF{jHM30=<@DEx&z%n=^RZGBc;G%X&PLbfF+Fbl6Tzv6N#pU#`!_81UY0fS!liD+pX zOCa+n0z9jE6WsVVn?-#tTxRm}NI?{J@hk1vu}-m?a~Z+3e2H^27HuHP;g`Vfp7bd{ z5=-5#kupc&#qw>V06e(*^|OtPwtkOoetmK>!niRhpw5LS@q9GsN{fXH9F-4Ca3-`J zqg-QWVdkr0;Hp)oy7{737vufLi3d&WR$7Y729capav}&saa4WQkUpw_^2lxHZOT2{ zW11PTSaANxjIeD!q}dbl8a`}W>vJ%!QJIDpXa?eCz&=5pPuDk$C+cR_<pyguy>6(NVDChj77j3)0N?$ zs!(;yTU-9ZLIYGRP3(OD7Dj9+Z50|(OcDJ7ZWC!5p-o%;WPF(?? zhH$T8MiPN)8b0VGfqCj2=aK8p=OBETBSMPLt|l&#My*9K8y4S$>pNcFFq5f`iVH7J zXl89Ni5&tr7Sji4-fo=dz>2P`gUS(c*DfENH|r4bgIkAb4l~rmB7Q9%bP26LE`5at z7Oe5w;-{~@1&3j^mFhbrA9_1zqY1Fs)Zu$-fYr@tOpVOEVM%cBYS_>%WDbmu>v8|t zX&+$LVi%`byC->txf7!GG4GT=LUJ9t&u%1rn92?pSrS$^td546fto>%$#$v@BUgl}>_%Sd+f4a01!@$nrapw`yGsP`5 zggcn(ptE14=;MMz_zUX(8KW>Cj`E?9oVor700a~FlANdAdWrKdUjxEpJHs6S1{Mzs zBAUekW@;$Ju5zOO!WjZGyTmL$C0A5(RsT9^?6%ht|6RZ(n@ex}2$j&d@OX*e zM=~_L=gp?X*1J8`bYVcPtyis%WT89Q=9C3x4#h;^w!-`VotJTOLe#2HR-C(6_b?*q z`uu#{p~(nHbJqwp7FG0>0@vA4-}(wnLX` zU?IdP1U$UOdF#Xo>K|hRGkhz=di2z|N;vocv=atdy&SgbpUOY17`u)GNHY8M?_GSc zILz0FUtq>f9;afxI*Q}Pg9lhKiownR7CPTd⪼GPXI-tqECS)G(b!pyqWE5``AmkZ(SL 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