From 9af1dcb98be521a2e25f57d6d02dfd0bf7ddf489 Mon Sep 17 00:00:00 2001 From: Fabrice Mouhartem Date: Sun, 20 Oct 2024 11:23:04 +0200 Subject: [PATCH] fix(template): fix the display of location and date - extra space - without the location, the comma still appeared - docs(readme): add the optional comment for the sending location --- exemple.pdf | Bin 20691 -> 20688 bytes lettre.typ | 14 ++++++++++++-- readme.md | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/exemple.pdf b/exemple.pdf index 9f0b13d375475d88f9810d4dc9526a588c577a24..1c7ebbca0b91e4deb5d9fa4e9c8fe2ddde99414b 100644 GIT binary patch delta 1259 zcmcb-knzGo#tjqf8I2}Sv{$e1zic3|?|HaHL;~}bt?7R})_J^Xln%;2(5R=ie67oN z@qf0Nude@?Shh54>&8bn9#__UKD%R5=gWN6<;NGO$hQ?H^!wlawf$l}-~N9ak3aX@ z@cek~_BsI{rrU3JouBRZD>jJ7$LnnS#SLeJzyJN$E|BzVdLE1UBI&8prRT$@{k&R# zthY>V`{&OV_TQiD3so<3-(Gk9f6DCjcc=TVx-Fh)2`^ApVvWU*RjXzY}Zr7V7KYMneQaJa>?FSF09dr&le!RT+ zq@dIe*^m;J)em|UUS56qaaPq`*TiUdiHp1E3v8WX)R}jz$RpspnvGD%`Ny#jC6?a| z(tCUP=63Ic=YpOty4U>Vn%aY^@~S=kx9(rxyd>SNnAxc!`j^$JuF`vt?xhY?} zHtDa3=ipiMFifTLhhh6;uR|vsdzfsU{%kav|3@dZ>rl$NLlc#z)$?g42E>+5ezmWJ zDRFeOx1WyKyiRyQ8YI+XX$3yx00THnnhHFu6Nz>f#^oV&)n1Ut?z8(%Zp$<=Xe@N7pa8hB}{Rf^TnzA|kypSnW&pP+S`mK)>{LhL_`BXW%I3OeM@u5=HmCs&iKUt8l zMZ7|NWiX?hzF1hxo;wpadQD&u35!(wadqGM#b5WWU6`RgX-PbjSMV-n>z1IyO~Kz* zzAFDRXHwvksU9xcJ7kxhd@P@@U-|Le0*PDqa(L!y+DVaiA8eB3q`Fmeo14V!!(VuJ&GQWJ-8JRWf}Jy#abK>u z&3&q1a$NUH?u<*%I$5uBUuSYQuPRgiu|VC+$+*ZjZwI$;n!Tag={3>z4v*V8WK87~ zcSQb=(w?Cry;;xnwbtg-{wJ#QPuA~E{QZ$Db@CNmq0Mg2TUpeN3=Axdj7-g zD*%yj?_;TSQ-zJ*4WEo|i)ol1O~{C5xYhgbugdSntcF9qdVCyD?pBIUyfNc+z>)BS zQu(a&Oe{lk9k0Yl_ik(JOV51%_0-lQUOeCHkC+?2+9qjj-hOU%hVnZ$_T4;clh_pY z%`WD2)+v-xsy}vDMj$ZLBF`nk!w9owE#0AxI`CP{> z&Q2@JntpCyELYVuqx7$GD%;H%Z|;8lxc17wZS!<(jb}*<9J+n!dSK|9&vM_z9J5uo z8f||a;D4b0lf`@^RRvBayMUJmv+L(x_ETXFDzL45ed2TZrbDlqBJ-}6w)ipmuC%GU znsUAI%)1v-Gnf6I=V5!HhnwYL?dzJSLU%3~YGwLw?Vr?ie4pqQo~VKeo`ol!q;KwB z^hUIlr?JuWPL~S5{j-7?PYKJ8zysk1xoDr7BL3pVx3_xN3-pBNzdE6^q`2`+=%#|e zvq!@c&dm+46W{HrPc`;gPk(-<`Rf6OT;(LjtzZA9eq5bV|7Fs5 zm$?a!vfANS^$jW`dKm-k>Pu$1II4fj&b7Ree3^A=&AlfwBC~GqD2Vl3W%-NCQbXdc zfvP)@hdgx4u_yxwqX^B-eG)7jK75ukw`kfUJmuQ+lC) z+vWuub?p)8%wXNV*rf8$V_h}v_@m<*LBvK{6)dmrD|*@~a&s z^DezMEM@e)WwUWX)x)TS7jEbCSmeLBcxJe*JLy}#@Z=lyV<|IBUt4GVQD|KJOqoaj z+Wu=?YA27a@jkoj)SFMjpYBC}k~ePn%Xnt;M_1v^PR`p{I1DWfEsf0$EGBt~!`YkV zJ#?8x3oT4alYG1^9Q`VToPClCvrC)}wKpevb2D-qT80=}S{a*L8CXm%_t8S;Z(if0 z#K>f3H2H$B8k4Ef<{!Rxj7&y`lP&y{>&+AlKtLgnmkZ1=G&eS|z!Wn!zz{Pv#1OME zG%?3eXK92XW?=*~PYGeMg^2}*ftKb*=96s#5{ 0; + let isLieu = lieu.trim().len() > 0; + if isLieu [#lieu] + else [] + if isDate { + if isLieu [, ] + [le #date] + } + } + grid( columns: (2fr, 1fr, 2fr), par(de), text[], text[ - #lieu - #if date.trim().len() != 0 [, le #date ] + #formatLieuDate(lieu, date) ] + v(2em), text[], text[], diff --git a/readme.md b/readme.md index 22a4c68..a287f99 100644 --- a/readme.md +++ b/readme.md @@ -19,7 +19,7 @@ parameters, with the [`lettre.typ`](./lettre.typ) file in the same folder: ], objet: "subject of the letter", // optional date: "date of sending", // optional - lieu: "location", + lieu: "location", // optional introduction: "opening", cloture: "closing", signature: "signature",