PyPI - pyOpenVBA - Versions diffs - 6.3.1__tar.gz → 6.3.3__tar.gz - Mend

pyOpenVBA 6.3.1tar.gz → 6.3.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (234) hide show

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyOpenVBA
-Version: 6.3.1
+Version: 6.3.3
 Summary: Read and write VBA macros and Excel Power Query in pure Python, no dependencies.
 Project-URL: Homepage, https://github.com/WilliamSmithEdward/pyOpenVBA
 Project-URL: Repository, https://github.com/WilliamSmithEdward/pyOpenVBA

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/docs/architecture.md RENAMED Viewed

@@ -85,11 +85,12 @@ Other files:
   {pull,push,ls,forms,access-ls,access-pull,access-push,access-disasm,disasm}`.
   `disasm` / `access-disasm` accept `--with-source` to interleave
   the original VBA source with the decoded p-code.
-- `_templates/__init__.py`: generated module embedding a
-  zlib-compressed base85 blob of a freshly Excel-authored empty `.xlsm`,
-  consumed by `ExcelFile.create_new()`. Regenerated from
-  `tests/live_excel_testing/freshly_touched.xlsm` by
-  `scripts/bake_empty_template.py`. No binary fixtures ship in the wheel.
+- `_templates/__init__.py`: generated module embedding, as
+  zlib-compressed base85 blobs, the empty files each host's
+  `create_new()` starts from. The `.xlsm` section is baked by
+  `scripts/bake_excel_template.py` from
+  `_templates/blank_files/blank_workbook.xlsm`, with Module1 written as
+  source alone, and the other bake scripts splice in theirs.
 ### 1.1 Layer rules

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/docs/ms-ovba-implementation-guide_v2.md RENAMED Viewed

@@ -399,7 +399,7 @@ that you need the `PROJECT` stream (Section 8).
 Each module's source lives at `/VBA/<MODULESTREAMNAME>`. Layout:
 ```
-[ PerformanceCache prefix ]  MODULEOFFSET bytes (opaque; preserve)
+[ PerformanceCache prefix ]  MODULEOFFSET bytes (preserve only for unedited modules)
 [ CompressedSourceCode    ]  bytes from MODULEOFFSET to EOF
 ```
@@ -415,13 +415,19 @@ text = decode(raw, code_page=project.code_page)
 **Write (in-place source replacement):**
 ```pseudo
-old      = cfb.get_stream_in_storage("VBA", module.stream_name)
-prefix   = old[:module.text_offset]                          # preserve verbatim
 new_raw  = encode(new_text, code_page=project.code_page)
 new_body = ovba_compress(new_raw)
-cfb.write_stream_in_storage("VBA", module.stream_name, prefix + new_body)
+cfb.write_stream_in_storage("VBA", module.stream_name, new_body)
+module.text_offset = 0
+module.prefix_bytes = b""
+# Rewrite the dir stream with this module's MODULEOFFSET = 0.
 ```
+An edited module is source-only: retaining its old compiled prefix would
+leave removed comments and string literals readable in the saved file.
+Unedited modules keep their streams, including their cached p-code.
+The project cache is invalidated as before so Office compiles the source.
 **Write (new module):**
 ```pseudo

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/pyproject.toml RENAMED Viewed

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 [project]
 name = "pyOpenVBA"
-version = "6.3.1"
+version = "6.3.3"
 description = "Read and write VBA macros and Excel Power Query in pure Python, no dependencies."
 readme = "README.md"
 license = { text = "MIT" }

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/src/pyopenvba/__init__.py RENAMED Viewed

@@ -293,4 +293,4 @@ def push_power_query(
     """
     return _push_queries(src_dir, workbook, out=out, encoding=encoding, remove_missing=remove_missing)
-__version__ = "6.3.1"
+__version__ = "6.3.3"

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/src/pyopenvba/_host.py RENAMED Viewed

@@ -19,10 +19,10 @@ import zipfile
 from pathlib import Path
 from typing import ClassVar, TypeVar
-from pyopenvba.cfb import CFB
 from pyopenvba._new_project import with_project
 from pyopenvba._package_signature import signature_parts, without_signature
 from pyopenvba._references import ReferenceManager, module_offset, reference_spans
+from pyopenvba.cfb import CFB
 from pyopenvba.exceptions import NoVBAProjectError, UnsupportedFormatError, VBAProjectError
 from pyopenvba.forms import VBAForm, create_form, form_names, read_form, read_forms
 from pyopenvba.vba import (
@@ -677,7 +677,7 @@ class VBAHostFile(ReferenceManager):
         write_back_modules(cfb, project)
         # 5. Rewrite the dir + PROJECT streams when the module set's
-        #    identity has changed (add / rename / delete).  PROJECT is
+        #    identity or a module's source offset has changed. PROJECT is
         #    always rewritten on a structural save so that any duplicate
         #    declarations or stale ``[Workspace]`` entries left behind by
         #    earlier buggy writes are scrubbed via the dedup pass in

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/src/pyopenvba/_templates/__init__.py RENAMED Viewed

@@ -15,178 +15,175 @@ import base64
 import zlib
 # --- XLSM template (generated by bake_excel_template.py) ---
-# Source bytes: 8703 | zlib: 8090 | base85: 10113
+# Source bytes: 8547 | zlib: 7936 | base85: 9920
 _EMPTY_XLSM_B85 = (
-    "c-nn=1yCGY*X;md(BQ#6_~7m?!9BRU4({&m5;Q@AOCY$r26uN0?hcRp-FkKZoBw-ny5{uho>"
-    "{xA_BmU6Ed^<)cNhQw0QT)m0w_ykQ`Ch300iCv0O)Ubv_!zRPA0ZadMfUACXPDvZZ_8CiJfv"
-    "#Bq$-"
-    "L6m8uhr5Z(qQA{fy;~vw5R}ck^$A<nSziMpPR*&k^&8ID|AYn|~PKhA5O6fx^1B3a#i)a0gF"
-    "JaVh;HSg8zO&QPD~f<l2o!|Fs}=jKmbjI7-"
-    "p&3|O$RX?Zzf_}+GxHG+n>!uMh6jr1~rH+`TL;0+7D4jcHAsHX-P&&IzAEEK8^-"
-    "I=QztnxB{JoM){Ja)tT!OaiP&pEfo1d>x8LzD^1!KvDUQivT<}x#a(6f&JGy!(~onH4Ndykm"
-    "JQcw@=e%nj8~L;2shrhc(lDdWu^+-"
-    "NTlpTPMy5U8YAJKA3O(qOpj=RBXqg@uyy0CoxI<sP`$XhtZ}&)5SI>+lZfa|U3X%RxDC-"
-    "p8i^YqFav$Ihz3aL#Fxu`V;S|4U^VI>?!Ol9Ks;nE#AkgNvZnp;)cSmldb8q8pHvn0nuF@_a"
-    "@jE74h}s*ug7V7-G)~9*K*XVGJZUIo5?@|00?hqJqHtOM+W-"
-    "8#`4KdDJUis;Ck~qPf(+)nU;`f`mtEhs^}~XcH)8UJQ;dI(NaAYaxOyc)%x?^S8&L}$?p0L&"
-    ")z1Pr8);4Rg8F9WMD|@i@h^UiAqFDi|DM~He~b3gXQC|?2<%v@zjX)z*w<vb*m-"
-    "`TGMU8@9{nMNH4@(3Utxi5a?;)z&_cfRl}DRh?QLB<MNP}dX8@oMw`-"
-    "2J9c&<L_ICgG1on?+l>x2)@sz!o7x0e3Vb{Mr9jXwwKUBqYBt9+ze2H$VX=cT8zwt)>E!WGy"
-    "O-IOJzV1t0`fI7Pv)kvL<xmz@drx*kwp9a5dU@xFMo-IArt^m{&tD{cE`<{!4>RaWe5ga{bz"
-    "rsXo0t=F#Oik7GM3`3V~6TB|H%}W#y~{(Tmp2kF2@uk_tBH29pgX4{H()jWs;U?7u6B>^Sk;"
-    "9HIA~hUaV771M<d_ye~QMTj3YIZE_Q&&J$?4Pk+x2l1MwR2;7as3(W>NARAO4dF?x55Q>dMg"
-    "*ufTcJFL_dEHh$F5+mnyA?&N0#!)u3%&mZ&p0QR9(`dc{UF_RF_f(Sr4w5D>w%WL3LPZE<^6"
-    "-=7XUzsBH52hti>e{NZn9yDUcJ47L*Idd$x&rJolH;oybT3R8!5@$A=z5M#&yc@TMUo#wE>y"
-    "c|#Ik8nOrGsTPhLJUV5<;_`B?LG28BnFx>qIMI>c5&{DwBN@Toh6o?b-"
-    ">3m2E4LFuYZj3Nx;N6$I#7WPyvDUw6MaiA2Rl}ziYy3GO4dpfie)qQEEIuYjD3zv%o4##&Hy"
-    "IvcyHsANA@5rsiYO3B{=3am3*$nbMPm{N2zTHLEl-"
-    "`(F^Q=#gO7o85nUw<&e6*g^z|)AtnAUM3&i#F)kz{x&*-&6B*{@Tv!5-"
-    "@9q}d<bksjb#qR4lteDOO*v~5smT21|~cpRx#3`L=FRbS(I`D>_Vgkwv)E7_S0F*Yv<=@Mhl"
-    "Eg<HU$)b;9l2h3%RYM<!laR{8b=4PIr^>^fIz8VO<~?Ufl<i`yoa5J@*9Uax$bvP@k|s!9=o"
-    "K@)*T$i*q33?V647g?jCOWMFOl4y8LHT?5T#~#QCMYIG+)tVu1d`c#SfWeQa(bCF~M{D1{4m"
-    "oZ4pu<w64b%H~<d23lS`UcMgG<G<n$aTbvN6yDEH+uU&D)V&JOZN?al9xH$4E07gBpp5F)1;"
-    "6e-"
-    "#$#lkW)iNN2+^yzbT7+w&(7doP87433t=9)zxktr`b<iFNGgiMiSw*^xK#AK}ExNIw{obyAI"
-    "qgalMy1coI+BbVg;q<`wAe2#9lsK;<I+FsAh-Yv!}&AK99E<XN!H7e+#BUiY)_5rNYZoLyeG"
-    ";<st(OX}7KNH@hcmLF{<6LraM8jZKcsN#3Y34h2ujh%r8VdJp)+ybEc65nz@f<*csfro_!YB"
-    "SJRtBp+3KtUt4X(f5+WRe=R)0FMdF<-"
-    "!y4CQ&<JR;z1p%~(b=|5`Ug6BDggV}&{C7C|U%`X!-)4nxISTjhaQr(>{m-"
-    "EMJ7pyZ$#pZLh~0i#?o8*iS3(gklH-"
-    "6a<_YS8&^Al>vY0(!B<0{K8u<wn93iHb_lot}+Doez=xP`mPX`SxmJ-"
-    ";ZUsRW)diI%bjn{8IU!<G>T7{9cyQHN}vn_XOP-"
-    "%Vih8B1V3EEfsP4wM(DrYWJG1lO$B4^)uGs+O;X;arE);MtKi4)85jdua#P*X^IuAaE0s{hq"
-    "mc}hJ{-"
-    "k6^^gf%cOQ#=$gce1KCe?9JJCr{kvT`&20u}CbsHxaUl{b)`@em7+=ookrI#a+4j$(Tl3vw("
-    "36Tl|;wB%BKYLdT~S@pe%U2}d$U=Y_rya5b-"
-    "c<psjO9rksy)S&yV#&*5sFzkQwm!r9fiIXG4e@;w)`7CQn54=Q-"
-    "0yw*sd_>w`eO{Bypvsp@6+i4Quw1#3J6jNE%7o6hXFYCKqmbq<W>8&?34F9?|IvWw)UP|vEf"
-    "ykzS=cfDsU*pQ^XZ{6+}59qL57^0d0-"
-    "<9=_KW=03DLCYlYaA^>~&&zUJwpdjjV|E+%~e;mEh<^fJuVUgM0OYfP~Z5l*Sw7TmHm3P8E8"
-    "WuKmJO`p-"
-    "`$Zm0?1xPS?Ha_6Ym8@p5(Ft@}7`Q(2C**r>%zSnpB7%aK8NN3%8i=q7#SbaNNO+&}p4}{vZ"
-    "geT=sX41AAq9ViKPCV5`swA;Y>*c9f^^~VOPLI9ThTdSt>{V0%Ax9lqpSffL-"
-    ")tI>%zURD*lVH-faD?22=FO<t7Eq+)oQuPy{ax$Gvf_yBn37#XVL^B!EwYqPXi+_+#iEQ=(9"
-    "{wu)39j)7^_?hp7ug)^;<&SxwZhPtu&oGW$v0l(;57wH;2N+J-"
-    "_fqHsN=}M6Fg|S9(?Y!#?3_)A2rREq3XbbL#-"
-    "Pz^u264&>HzW&f8G4(tV5~uhiAZ2O+!EE6dZ@FyGt{r_Zz!I>MOY!~$WJA|O3+2X+t~Tfh`#"
-    "V*Keo2C?STHh@HhH3LT5k#0G0Ib=IU+Xoy<*aO#UAKv*yQ|W3gLxAKI|?Uy1imYRR--"
-    "nABz0zb+h&9wC{wXl>uoPN2C`DG?vw;B`Xw?oLblLt0Eo`>#5{MgYzI-ZfsuY7j@VKYxT*tf"
-    "pObGNnwjQFiJJMLjt6e7YmNzoR|afGJH<R|`Y<Wv<_hjK3tzYK&T7uP^Xb7LRWU4bA*rkRry"
-    "s71<GTjPHG9s2v%45~)=(8chuG4|M9Ed8W!ia8g3N`Z&3zNwnDVLJ=@g{Uc%BYz6jG>DgOO>"
-    "D2m`S{O<g^JAC@_@q`T88xvSeU$IMhe^e|1_kMD7sU4|%<oT*yoT3equS~~z#Uo1e01Rx0a<"
-    "9h3&KYwoR4|<nbD7&@gaNwY8e+?@*<@x8Ai|7yLH||%8gz*=K^|!7u@Ezog5ZO=7aWQ6s?(7"
-    ">TmMtKX50n1JcmHuY1&~|Gs5)qxE?6n3Xd(dj_wfU3a_3c`V=87NYiTb8@X486P|kws3={q3"
-    "7|uyD=WWroh$pM+-RE;cuEczUC%x3ZTVyHx9bxAt>ab-_TO|S=R*5pBy@?3D1D@m6=A>PRP)"
-    "5&^ZJXCAWjnI04QoN=#heMhi!QLP4J=`;a?k%BAIZ9xsvvtmRQI2*XpSkx)7a-"
-    ";DVOk(uBz?shY{&HeJBl%ulU=klNstou5{-"
-    "DywyzC}WCi~IC(%=flZ;Cb<3Z|&vj*{q#oON`+4hN0d4@p#R5pk><ld1JU<&-"
-    ";Fb$oDapfuE%V27lN24zci)y8J|~^Qh9d0*LX<wHPL8fED5=b$H;qC<X4>0d5!^hiDUmo}J7"
-    "`^t0|AY1u=uu2eKUKlua|sBC8OkSM&uOERKT{w(t7k-"
-    "$q60#_tE6I{<4^z}hzX@v+`3JJJL<80J#XojNkH5aGz<ifzkerzirzFrcu0J{8Zrn(TnX!^8"
-    "`M%F~a4Gh>aSx7TD^ENJTgZDU0X+(J-0ytKnA#-"
-    "@xZXdD%H3=I{NYZpXB{6#9KqMP7TPVVye_t4*6&eYNOs1Jv`JgxCyNqrhsoCO~Z8W{~ILZ!n"
-    "0xr|kymynoig2d#W1c^0GmCd{8%<IL9Pp5VSpxhC5pNNqwvX$s9q}o5p%Z+6ZWqw`e`zC{Gl"
-    "m#2_UcfkYewQ^uZY=To=v%d6Mk1gB0S*n5)U`VY>N5JDa7g%B-7@O_@FtmgaKz<+|-"
-    "AnPFq9n>2K&FICkJcd0ysU(1EPs<5A3zHkfH-MB^>qB~6!Xm<`ta8D>Tr>{{)S;#XI8QO8(0"
-    "$5vRsVuWS&av@<iUd|QO&GTpqe3ypx3-"
-    "O1up;SG~ILmBG0+>=v3)daNd&;(Ze7V?FNd`>glMT7&e*Uyp<h`mj<9K^Ln$uFPwS(XFj6BP"
-    "3q&~?an)o=m+g5YmPHTg7yz>~a+xD%I!TiMtdZaGIVitT&1v=<_<VTPh2-Ze-"
-    "B2~Hmh}}7Xfu4&Sp|WB+lz^((T-O*F$yH<($#M^(O^kfUj4@w<OM?0RKwTXN-T!zV#-"
-    "{YaDlNOZs3mgG_Qbj?9?*E~`c$H4NE5j#=jw@9!(6FZRfI6mSdXfRCxbP?9JXJ#DjSr(kX5v"
-    "gr*gGSq%=_`7OZb6<fFU{#)_atg%naGEDUH5Kgp7Kh-107@C-"
-    "S)UUJ2>kQKFQJRr3kX7q<Wc3HD8dt8dMyx`4?vOV?gX=?n62RoxR>s(Qsu>?nga0Crup=FRR"
-    "=1+H_0!>!nPcSq&B|uSYtUbUKmhV?w2@jL6PHKyq33TCq9fAs)?YSm+H3N+f2c9{i&n-"
-    "tYYtkxEAzxW%Pzqy;N3Fex+O6tKhu?{z>1a7tZ||W%*R45U?u)Ar&`hK5*3PtEZ_2gN+~(c@"
-    "%$p_rjp33cr1&zh?3{H5i$_GLSF(~<=_y%a3tjDxR%I3k(_!S|p5|F8<8EDt=2U8bm3SFdAK"
-    "uz>QusWCD<sacNL!_SC*bBi`9WIrUX5-"
-    "<B(z6|2&TETP6I@%YIVB6p3yFvgP#XYD>)&uk4=}feG~;ccEl_nmL`qRQTk<(2!!R6KtPZv?"
-    "YNN{r6wX&lRRp{CKhO+$#rC@>H(w6i@AU))S_fZbmLVuY?+DGW(J_!VAYe^q~zITbwxpg1~u"
-    "+ATKUQ|&5{!!3py^OBYAw^aYFZ(qK&I3$-"
-    "EUyp6F}=b2ebxngeCqVN~cU=<zN`Mrn=#k~0`1(fR%*@b{W04C%^~zB@{F&ERxpcmZjtE3x+"
-    "J84n6(4CEs^c(bn6pTjb$&$e*lrY}ppatW7JT-"
-    "WUAJ^tE(3{0i<p_Kp1h8u6zgKi!Rt}CvM**XWXd$wreKsID`I;*CCbbW>brIZ;awQas^Xv-"
-    "Js-vv_shH5h9t&LQBE0XX3E|88+?$#!bf0f4X$!k_ij41tUFpoq*s{|Sq$K*nvEz)t}wQy<z"
-    "TWRVt!+wXxCrvNRzw#SX+6(uyFQ)E0xjro4dVM09%SzDiFGm;0LXkIwZK#l;yK3@V%N{a^_r"
-    "H{xlffN9XxKy2or)z2yYw6+;>h$Ir!Llk;8?A94AQRMh-eJAXgo=>j#B;A9A0I$tvRf5+(km"
-    "Jh}O@gBxBBrvRm>%6lQqiz9gQkNOx&So`3e34eejDduwGwt0k%1fmB!qNib>y$?Zuy>8UrPm"
-    "|NYK)+bMs7iWR1cs}P~W*(x>mf(=l5*@^XL5bDsdJ~<Gq0xqJ;1!q9XMQSZQn!eOA~Mdw<2$"
-    "=6mP&$=DS}CU0yEE~As9uHo6kI{zRsb29v4J4A#+Z$RdC(s4`W*H4i_InO>!$j3m2n%PND&4"
-    "V{Mn4Bh$_)g-"
-    "fy{sfnfnOHFN&cDwvr=@T5%%~abC^tAXT#MIvNM^BptLdt~&e;@m#vZ(S#zDFtvEb;^nLPf("
-    "~5A@GqO^kq5ykM$gXf3=EV?jcBd_)P!-tS(BYU`ekohP{8>Pu8!+UWHWh4x>};i-"
-    "{#{cza*edX}xPx}HY8n?fWd*>iL3?g)mBix}>WZ<Lf*M68pc!ueWNoc~Wy-_4OSu;t-"
-    "4oK&)20c$vt9MMibXirY4pJYM&g1wF;2w_|C~+dQx$Oz?tX1k;i9z_T((#X^xSF8JZuPQCRk"
-    "~r0RQECuO)m91XpC->wLLrEz_)C@-)EpFCy?8di-"
-    "=ef`3Z9#n^);)mLcTx`t0VK<DIg7E*r8{)DmHzv}=tkds#|L!;(pR>13apypVQt6b%-"
-    "OVkGP}b7a6s6(%xs&Kz&7_cM4*rRV|+z_Gr39AEqQ2DUUnEkFEgO7qs`{k?%*3=I?<z?LRPP"
-    "V|Nrw#S;j*64EtugeSeQJwn2=|Zr_8wz!kU)p$h<g^(hPrc-"
-    "X(RsQlp5RUP?u2=dGR^eNvBj7TCNCsj1$9(a(`zOzr_4*`oF+?-"
-    "+cDlQWkKl=V+C?fny>1VvPQ4hUpEd`vH}w!!xKq+c4M7ynq5y@Pxrjn9(~sCA6KJe*?k}SJd"
-    "b^Q(eVA=*Mkn%iw2DV)@7@1ewd(Bm+wkB8d?AqT(|s=nuYamd2Y)<FY*3l=w0iMQucMCIv%K"
-    "350W1lNMK5+Ul49Y$?zgX*dn$sn1agSHtrpPxW~q)DZQ_j1fGX0X*P1R<|eDwv~^A;6XFRgb"
-    "1oP@(=&QLhf{g4FUI}tynv!J3cv{4RD?n1><S`aZ_-"
-    "j)ETbo6#}bM{_Hv2L*Ky;;U<(hRP8KSYjhK)fJPk61hxHgyN#+aWgdGjUCW3g^x{ew!HbfGs"
-    "G?{u~DFE@#zEh#D_<hLz2NRWoS)F3L&-"
-    "6L&QG*4a!84Bpfb5!!NAm?~(`U;CVcGKU*K1}L&*kFJ3!r9=bntA2N(JsB)9ESwT$#ir5L33"
-    "imp65&RgXW*um)KbTY2=8_r_C~`>kR=da4k^OxM_*Hu@Kx`9LQ8uAu7$r~u*s>`)?JjH?c02"
-    "oBkTnqaVzO~bR6slhv|=-zbMxeAip!(M9-&CsFfh{8=NLK>{ymf}HLDT$iRw3-"
-    "6<QMVQPIq6&_!}-(!ci}KWagX~rWI{tnsS$G%tuH!3?*g#soAi#xEG)?Tm(R!$hBz-BWCj<c"
-    "e}_b=sC-"
-    "x{&UcLEV^UIKNu4>*gzVP`o^mPoTGUgGVX%5i+8lo>z86M{s1TnqyeW&eao5PCKhWeqyvydZ"
-    "L_e9+`rU4a&_SfJZj|1guJeqJaEEzcIW^?)QtBc+6Z+wybSGV-"
-    "v3)T@qEoNxG4)pM%JcfAq=bVe=M;3NR?s%L%aJm~$Y$4`ph~w=?2L{)3a#B*i110S#JglvdF"
-    "i#;TurLXcK)SB&;xoC%FNX^X?)1#OTn0KQTmJAZg<H6kE80;?Y`>N9<%DyT9j)^!Rd5KL2Rb"
-    "UL(I=3`r#`M<5afi-ka0fBi|UN$9oI}ua4QpcD3*Fw5ewbM{Bu`U|y+HP;J@Cncm_K&FdnXR"
-    "lK@QRZ4fO)ZA<}=KRbOI#kjeNkdWIw87JRfRL120dVVCo0Q)vDw3kXjkNcD-"
-    "}jtu#Wd;nh!l;ToLG2K5+Mye8`A?DNeqHo-"
-    ">zjNqHeR<xyno!vy_V!SA!Q%ll3ZcjNY@33qt)p@LK9O`6`;~bG-"
-    "P()gxD@5@72u_&a~Ot>Xq->&M^!I;rUnj!|S{R-(6DQ|!N{r~yMisAD-"
-    "|!nP0BvHcV)m^m=l=&wr}>6iiD=nwnM&HyP?CRqsS3JLY=lfOaXm=6dM_~RwIUAWKR=$EY_q"
-    "Us>rg(J%~>jVt<*&1s`!75S)wdN-"
-    "}NsSpEeR846YgOn{ztEOcyYy*hG*u36^`MU)?TPy(R&ZUNqIOlr4($N<i=2yzDW2f9jW@MJ6"
-    "h|X!Z0J~k9_;h|mv&OHIby3KTAbGksUa$nyxWAUM%2)X2^Si*^s&D~A|qw09*>Sn+@9e=rY7"
-    "!TVvUz>Mm0}JJOP6xxs5PPYNkqrr72>#y0t>WJ#k-"
-    "1VtDIB4vEAbGH+@K7k@)4XQSxDCd{$|yLWjJ#@GfIV}_|f_D_T1vg7Nnx`onDvZm1hO|Ehav"
-    "xlnM787<=AIeCym|sNAN<BFFdpI`P3sWzl*Ii%dTz}OAz{p{U45Q05uV?o0$!P@@hdfZtt+|"
-    "&66!8lbZC^4~RQY;u_13bF4pkmwesgr>d4JOg<M6F{j(hF9nHoB+;}|=|Zp$?(aHQd8XRbR<"
-    "xiw+rdtB^ADpZCwOk}Cr;<&Tp+*U<Crmcri8gOiVP^*zjV-|-`WSkcc?8L-"
-    "n&CEG>mkN|XOH{}ahLL|Q#3gk{6cGVVIVoY^U+XjC-ejkGKINjE4fCT#I6XopeDcag+4e^Dj"
-    "csq1Kzw&!^cpaC9AUXN<?bwnJXh^wdJCvhQ0^jY*-w+?u&#1x-"
-    "jvdP?^&$+MSR1#891#iG+E%}EMC|XHg}Ax8u`79o!sI+AlGb)Ylb1H^(9UZ<(;rOghhkEQFL"
-    "GK#5VyHL@}fI?A0&Yo{F0v4d+2axuQXzV)agt&XrtyT3T$?+A(fIa&x|P+yZl}z7eB)1n273"
-    "4<B<geM@$d%bu7ij?&x)7E;tC+Rh2L-"
-    "<`SpR_cWTp?WBLg?suhm43~EV4nDeNk!q$c}Z5{5gx_G-1W-"
-    "Ymn+a!0>1|^S7bXiTe9Ka+`8Cb!JoYdV)ZAY9BeMrD}Ud}*2j{l1gw2@vgc*EnhZ_(+|4U*H"
-    "D2l0fu4>CY;M?ceLh|6=<X-"
-    "!?s2w@V}d3S%PcMR!Ar*^WyDLNmR@ui(&K;a3F}E(8fj4s3oA?Kdtc0ga6vFUQ2z4yHje7#_"
-    "~LVj%g3gt9qbv0J2;){cG783J7G4m=F8@X?>^S=no+>o#a<qA8wDR=bcYwkHXxd*_L~#9vj8"
-    "s^bRC7X2%N#F_`;AdBqG9=y%$TJxCT2O53h)RT8F=!fEpN89-PrS3lDv-uzus!RcEiU_w8=e"
-    "dV+0o3+1Kb0xJfDt))*78xU635M`Ajl@@@nmE?r40<15{TKoh+%ZO=$N%HUq=Fpw7BE9dnT_"
-    "({CI%_MlI6q`(3+7C}>~-"
-    "v?FT$@gZDj%O(yJuiTeEm!{2&kvtzCQI^rHlf^DSmM9gdc?4=+Zpyk9>A>?2(&18x9rxPn*!"
-    "BEQzp?oIX5-"
-    "s~&nS5UBk{enVcz!jj6Its<l4B`mt2a(`B=MvCsihD_DjZYMS=0^os;Le#w_RIc=^Ue;X!x0"
-    "b?bqyH?^$EKU%4^syH1`nOI~9PWRVQ{&0BwiZVGp1LL_u)Et-E)hW|&|cx-Osf`oZf%c31!s"
-    "0oAjYFu^lX0z1k)FIU;RukL=lctyM@PgsADo*il49B-"
-    "tj73ANYkuliltu3;1WH16dnEch=M<)zh{)Ze6ehHjdP1)h4>T>x;r@^N1NlMC9IGrrlgQU3j"
-    "^0rrQlgtKFXN|?o2`2gH=hAIFuee#2Fk>#M4m(i(!smS(HhCfiG*XrTYO8O;p0MVh*VdAk6>"
-    "a%iJPtb~;7BZLnf)Eqa&)3%4Ds)fSP{~k^)<`cXRR<rOrJ4%`UDm*?c(>8%Sf0zNxQQcodZz"
-    "`k^_*XZg*4}Q1AmG-%|i(m;=VF-&J;x`13as*G755a7-"
-    "w3j@!gR&9lnRMtRf>I0md?F$}j^(#X1kkc#M`3zwlHXXmVnlZ?4FEOA`P+degcXfQXs;2YzK"
-    "32)ms+6CRq+~WK`EfOE(3{Y#tW@oE8s$jV@$zDooVt|CH(#FrX^Ok(sd@+A-"
-    "CHUe+qLObRY)LBIp0>RZUL*h8%LbBgD86rAMt!4}QU0fw4eadxLn$Y8+Ac97hMYn@AcdSnXI"
-    "4;!2!3WF19{B<07x$Vq?oEw(7+I#{c(F0Xw&1|obB<^_k~y>PNiOF>nA1}7h<q_r9-"
-    "^X5A`NHnx5|SlZ%XjFj=bTen9ZPe@}VaUG5FsM=}>djk!C);G(oGaj9xH){xKGBu>$ljBFtm"
-    "!3ShjC7Hnli>W}!;ZolA_;IEnw4q^64h-"
-    "df+2OA?nz;mb`{(l##5ps!*sVW92!PMS3qe62%mla*bO%iokH-"
-    "l++Q|A_N0YS+e(Ohv+H@7Y(X>fkAEx=f7+832p;^pa6hIGuVRrD%K~W=pG=c?Y3fE9@p{vW("
-    "QR5g9g(v!SUCFQk5)*!MhDe_>yUcm;;VxhE<YfxgB!E$4WBA5TEx~BMf-Smev54rWL5|pW1!"
-    ">Z4m-"
-    "()(_4A_W9_8Ek&rTa@gqx_YAsa2D^|{>B6he(6Je8i9)80fR_nqzKvYbNhH&1%lF|VB74Z3S"
-    "(7nSb(t50Rr_YcDlL<-UnkQjjfx7z-"
-    "HKYkE^|E|6NY2Z(N_#XqY5dTt({{;T2q5cERhx}iP>Yw006`y~=EWrPt{`04uKZTHg>=?uRz"
-    "h#j>t^CQV|6@f5?!R*Ee;W9cb@<1C56T}L#GlYV-}nB33ZVa&x4-"
-    "}8fIpJrKX48F|B@pAg#Q`s|G?V`{&(yvNJ9hv`W61|@P2!sHPK&x{y*0Iq!R"
+    "c-"
+    "nn=1yoyE*LHv+0g4xg;O_1&#kIwXy9N*LP~2tk;%+T2!L1Z8R=jv|clel@^{@G+@B979%DE@"
+    "^=Gj?m@3Zw$Re*bi0{{S!UOwc2%5-iu0~i26^c4Vr{c=Z7671k=?%-;u>FH?hqR--CZ&#Jnt"
+    "qezw5q3-i?G3BYDJ6|&U-p{t`c8TQQ_OZ~5=j27-"
+    "eGm+pfSVhyUhhGq6PFA1iMke5@r(|DqJL!{VSoIO~+Y;ndtJyQO~e65<W3l3`o=<{a!0+qu{"
+    "ichf+%)HG*g+a#O){z7ao=+gwo}6@>vaggd2Z*hs5Z%7uq8n@B;9O^#VuQfYv<IlwL6<_EA?"
+    "Ke0unyme*fvRp=dtXmI5W!NrpI>A<#sa?7wy|;1#TUTvcL%X{R(dw9T?!LLz2;ZjpGF_z=AI"
+    "f$?Ylw2?dridDFIZ`zx`{@?^VPLmNJD2d;{BcXke|f?6T&ES{w`AE1Xs7vr)f+d0e(9|fd$m"
+    "XJ@jM{iv?sW_CUY{YqW)|83s4lZv!+$&MdQ3<sZjpgodQk2y>fTvITROy^xUo=Bpjkn}?3aO"
+    "U$cfH<skO@aH^C=cn`L`A+c1BkU#u=<_DL>c7m<@Q#i0;AN)>3jm<JTn(Mg?Oa${{#>i3y5-"
+    "^6F%Z_;)&xUZAeMUKQW=NRAuCd|i1<l+4)avliKUB8c<A{k4Hs*VJGtPng`@4Y8Nr>OR5seY"
+    "%yh9bl~KWAX-`gWh~=7*sqIp;j+?M;M|U>&-"
+    "*U>6v}MvFGlJu!d$ny_Wtl8C#flR8oY0=g_*I!>Hes;SBM=6Z7FSH3mSL9jH4dx7+M9Sk-"
+    "I@MWXx(yj3<LGG!^d9sA#Jue*V}2)EByRGf~P9H6<C45xJ|FX@Rpw2<s_g)I&(yNZ`_{Uky;"
+    "^T;_dc%PE8;G#GR;0z2bwFMI0!xL@Qx$F(?YOD+2Rxr3i_X%bLIe097wv(O>R(*s(&u&bB6C"
+    "u<c*xGgS|~L5CBts`cYJz@r2qx~5z((!R2aizMcUUE4iZK98KLJ+|>wbNSt>Y;#M!U<%K#YL"
+    "FuzG1LWq=V4^NVNESVd`~2J6IGJzUYEDr(Bfp=Gt>kLf$>hJzBP@&ClT(!`Sc#Vqi0Wg)Zhm"
+    "&ox74m(3-"
+    "8*7$^Fba?s~kJog#Y=ANfSd*E0+Iz==q6KSC>XWceifdA2eRukP2SjHckhllcRM13w(`ReM8"
+    "i5X+%)MKsszOl;wFAc|RHuOyHa<?Yj_sbRU7fOK0;#wtXBL+lHt6x!LsQ?8q1;B1AB!q%IZv"
+    "{%AANx$%k6m%r1D&e2?CH)vm0H=MHk|0~B&uzK+tLrO<4RAGDo?tQ<Jf|pIb+r+WBn3wiLG!"
+    "9vRE}4!G?Nx;g@%ryB~^lk#yO$SLhfsQDrddy%<-4-"
+    "z>7hnu})fG(aV?Qa4J&Cei8nIBZgBI%EPFAT4`Fig=(0mWytkPS)TP$^{D=;#!;M7hkA)@3I"
+    "3-kPJ&-al?7a!Bwn9yvZ-"
+    "q1Ed1E>vf+d1pHeM9ltlh9hh+(!T3QIb318D2pgbrp}640JJdQh28^f?KtHE?UXWv$g6L-"
+    "Q2HtK4S5?FO{LEOfsYSdrh)F-fsZ+wSRc&<giE~AGH`w@DG2O9yg`tHcR?bO-ZKVu4xrj>fG"
+    "xGVuuQl5OQeIbqiV!jxe1Kk-"
+    "%9trGkL0doT6)eDJWd{ijH^X_n&r|58>xns2>Y)7t1mGvJ4(<n<#CLH#{I$Sr`)fu8-"
+    "CbGH0dKOfn9}TVJ&t;QuE*nX}vbAsKy)|>>%r(T$@&%XzpIYF=_-"
+    "pG^pbgS!^LKATnH9oc?bmrAE|S;(ZD^h^)^$4NguXiDbTu;f%%yOW}9omm{_<L;Ym>jx1#SP"
+    "!}HbpTze-=}L+>CRE*Y<C0-"
+    "PpU;BBli|_J3%;;C^wU1ZbXYgxxSMXSW#w#_5mjVgkS&!R{<;_w^U_x?*<O7E*6g&~iugKn7"
+    "!lduRB<~K(Q0`6FsScVes;jXYFV;BUR`79KYnZIjlJ>__-"
+    "NU!(1UewPH^@ZM2`CoGm?>*ELXY`NqY<!8w(F^y4=|LrIg-uJoNJr;s)7hz7zCly`P3bu#SU"
+    "l)M+g9W!JzR{-"
+    "pi4I|g1LGv2=JN?u|V;ot7~cbNL$PWgApN)%V_Wy6rZe!JA2A?&1%AyKN#i&Q2U(gX9sGVzZ"
+    "eIYXxM&fZc{Zy7@)rL_v4@t!;SnY4l-CLa@+;o+rIgS(7M8}r_sycb>-"
+    "3Ro+YtRjKeWTWUUZ-?qa^QVW^*T$}x5RPFPch!G^ip-|-"
+    "=Cah{j8CfbcHMqPn=pFYH?~T*44r!u#PNO-TEN-Y75^~TL{?rm_-v;!tsSglCL$EZ6&#-"
+    ">^AR<Fs;<9qE&fZlVEp+_KlN#uWE{3H2;JOiEU&q+m$si75^jBVQ>A@0u9My-YSzx3@JB{6!"
+    "I>zj%fqrvr<9kh3l*E&!ax}Kvyf-a8OpyEmOE8p-"
+    "20MadtPD~{y*`{#md~=)rIx13;Uls%bqp_FOp#ZPOjzd(RNoJSLHJ43gy#e_IrzMmamjg7G&"
+    "77;0v9&4%@V76a>mx->t+3-"
+    "#hWtHWRrH8cYaChe_g=bWOZ1PqyZJxNC`U2;^r~q!!>9S`SA%O3f8zMl*v{OJCScWIGY-"
+    "9^ZQ=@-5`!vJ{h!ern68#9iq(%j~<vm3|ZHnzm^zpj5Alpxm?M*Y~OQJ=Pr6HDQb>Ij-RP8-"
+    "ls=m27Ti(H?7K$h}Bnq4)aCd$+G3IAq0<TT|1aNc)e(VU;+EuTx+1SOznXErvX_W!ERB63>X"
+    "F7Cv7-"
+    "Je^w(Ghv=lEbRYLsmKH^Jq4_mKFHfT*PZcJHe+QP)Sf~XZVlcMKbaZMHeKtm#~hviq+yu*V$"
+    "H=EDa62gYu4cDL8oPXi<cS&5Z0k7>p7O7{J6uOB>wq>rhEZ`u|?f>E%LDHiQanmBOWJf<M@2"
+    "ug|^dBK+LtfLOl^Jh!Jg1JEOf~IYi;iOeeHq9`b}p0?oJ49Vchp0M<I5od0T;p`G+Vv;LsSV"
+    "qY1GH|#tah0qCHq}$N`=%(!k_bulWhW9T?E|^B@W4T;e=163F$G{n>Cn5a%j&|r4<G&4mWmG"
+    "SIf&c(uQv6+9y%^rr%G}=k@AWU6AL@?BZ8W}t;_W_@?H)By={>P)E3M@&9E=^HS+whI-"
+    "Y`vKLFm-U_6Uf&Vf(kgD+Iz?PbvhiI3q<OSOvUlxroyti{g2tL{|IE^uyJHHr-ysb>JiB-"
+    "m&+?4e9L-"
+    ")80B_MY6V5ILbFGqc(KnMF}o5%wi`a(Oe}W;YBPgt5+dvIP<nt2k5c>w^1J*sj!nNY*VlpV#"
+    "#W;>Aw_MXoLXe#f6Lr@+*>=@KwYk5u*o3!+W`lo#ZoeHe564jcoLA)N$s=aZ!jVY*RDq<9G*"
+    "XUloPRCqP0%3^$7t22|&Fr$(P68t^e4^kIMpwu+SQ!jg>Edapu=F-"
+    "hlR@4jRXqG!H|7=l|O1eZU_8_0#T2={NCwo?dT*UY&y-Xn``ia1P-"
+    "h^7d`2e3)ie^(!D^&8ytq;5oDV0qnmuisR(VSA-_e|4XoH#d8NtofnwdWY{&WdItc_37u-"
+    "YA-"
+    "r5cphx+0nfl9=zVi#HgQQqXb^}Mw6`VFI(>L4K;0U|gzsq<axF+wBFM6?r}?F^6<H+Z<E$<+"
+    "D?u&?!#hWD6PsbTFkFoME>g2Zpl!6YjFG(_fhvuvkzmfgK<u=8`>z5aG+88@gM3CDZ~Ychg%"
+    "Dy(j#`kV*dgI&8yM<&epkU;)9H7<R{}P8o)PGFqIlgdE4CqUd_V4gT_gJV<8Ej5>EY3`lXpX"
+    "!<oSxV)ARmt)qkk{yV>LVNRy%O?J~&!K8{s{vkQ@U+wBIm<gK>KWP{t7`ln);iLBLFb_IYf>"
+    "RWAOgf%G|!jnD1a3HT#D~h3`A|>`o@0NnnzI0C-"
+    "7Eypoq9$AphfG*BQOP+Ks6r&0I%YKZ+?)i0=4ejnU5~vs%%PwfsYD|SoHEP7{Dfs9l~8|nJW"
+    "nlw@M93))=#*f+%kx{@RGeTEFgv@eZ7S%iF6$YsZt5n5@-"
+    "eG_ceY^z@82&U?c%@A((JPgl`X^8`G0>GlV67PoO2kP8y2hM(6&BG8{M%&Sr~6POg|`=~FfA"
+    "3;Qaw*H3=7EOryiFe9F}OPhq>BCX)n)VETC>B88@w;woUx&%z8=z{hHslc2;fuyL{DAAjTjh"
+    "8OOwA=8B{$DnWnFIfTg67O%hRl4rG??4a_;{*g*EwcWuYeM-"
+    "s>vmWyq*$(;~W;ak9^`>ej$obPt-fz(M24fSy}4<hBi|@wRfP2yV&@i7wu_fU~w0^j-"
+    "OW<Yx;1OsVRf6OpgL{ib)Pw_e;1XMJVL6S870G<yj+J%^Y`0)3Pa^?bDg8<3tsIbg$sO1;VR"
+    "zyl<$rZYJ_goD-b0sfl1(X+1(u6yIrw-if6$h`J(}!7m4P$Mf`IwbXY-"
+    "Z^q^NaxAa?v)&eQ&m;OQkE!+)r&QAY)HbyKwv)*o?QrWpXdC*eh1KfG6n?ZZ%z74lNyoU?eJ"
+    "_HdI28H;+m%A|k`ljr5(hh<Fj8~b;%g$NT3cgFa1?*3Z4~D%BU4h;D-"
+    "N9bYC>|{qCIVG0_?!Uc|`k)JKOY}&!z2AI}S&7Jqdu8L&!t9p$S9OiZaBTsGg%nx2_arsHF*"
+    "0jYtu1k|TV#aYZR4V<EeAmq_zs38X$*DIIELBkrfM1jdVG!h{u9BP|K)j5x}cy^H6(wDu0$y"
+    "Ih3eS}RG}x9m~ajIaeF9lEbNRo*Yg+nfm%L^~Y&_O-"
+    "U;5+Tj#&AL^WWiA5AQ4Zi?to4jDqyw4HG~ua=14+J4O^ebrn0**x4=)TTt3gIA)TVI2%tCM%"
+    "dHxC)GTV1a@@&aCHWGZ|f<3ns!=cNhN{4=7mq{yuD-"
+    "*r?B;~kbq!4i<jis;W@_BOy1HN(9?R-~8dx+sX=61tO$K_9DD8qIB6~L-"
+    "ZHqZ>1EGsXZiRb91KU_8{Nxz((vcf{k8CL>vI#^NsF`R*@9RD!SMH_z&`8ucB@U7g(^z;6;1"
+    "0RjwU4&}VET@8PdJ&0$&`~W#>1!?KQOS>e`XI!%ibfqqrgyf-"
+    "3p|;fQhCG$@Jw=(lDqiK$(sk!jE63`RU--"
+    "%k^1W2tdkIsgk@1sWGlL^6vya6q*`(Z?f7J(?F{)YoOOL*Y!zvDFpXBU(x^egI~@lOGOd{*c"
+    "qo!~3b(upw~~Pr<FIkPXT4sb#!Q>sB%?JmKiYu`vHt|A=TqtW#e-"
+    "bIvW;L&j;Iwk0(8}x7P=q(afR{zCQng)jun<K6er2;_9^(+sy8CV@`I5l#^?Is?==y{6crG%"
+    "5635h7`U;p_t@Z{jU9o!HqiqPC6iYJ*)lbYgj_NPmItqiSN9YVYwY&r1DDr5gtG4p3OETNg!"
+    "Yzeya>IsrIUL~VJqLW>j%fyW@s=fI1tmI^OavW{NetcAXTpDrcz(ZNUfJ7`TFk!>Eh~XXYTT"
+    "6YAi}wwOwSx7+giX2ZgMV=u{t4i@&$dAVk(9s1NR7Xv_-#^)Vs&`@;OQh#9Su#30X)v|U%o-"
+    "O{zsTk^T=M5DnfY#BTZ6%(Z9YDMOY)_~QVuU5!`=ZbTRgrg|UJ7@;eaiH*X?_m&cmiGjGnLZ"
+    "5fN|Q^-hlcgYmI&*Xqh!12ci-"
+    "9~>TEZ4M|2K*$f?z^2Km($t@tpu%kMzpCRd(|GAU}z=O)yJC-"
+    "*t<f#uuRw)RYVat2*!C6%xwWA?BD-b_>8hBIpUp9j(hR2T~4tqIjm=bSCA!nC;)oip2GLO5|"
+    "~@j4(^F@-"
+    "ofP;6tL_{0ILV=?o_A9xs&6TE`{v)j^X<TzQ9xYS38^Xxie(d7As98=nBydO^EL+B<IPsulm"
+    "F9!k<Evh_$31Rf)*OE-YSc6k?9iY9PV}71uC!aha`Iek6mL?KCy><Ha(l7P5K(woA=ob8UnR"
+    "A%wokvP<`vp?kg@r&rr{v1$sutmUI$1pGL|#%glYTGk_h4O|pcSG}x-xh@qERz3QWauUS-"
+    "JiqA5^V1Z<p>P!cR@*nom#`BUJI-Co5!n^z8rwo<M(PqWR;2pz4;*+zH=2l)GV+o(Ys2jOt8"
+    "cOrwT3Qz(y!-LZ+SL=9JJprcju6#SqJUOUFeX?pFh$)_IMx_86$`xWy9{zHU^<HqWI=-"
+    "eJVqJpb6Mz+#0{wvHPqp1*cETxTpF8LY{+|ked9ABpv`<->heo{dn-"
+    "L8<^H(u|uvQU#K?<hw`E=qnuJdG=;39!r*_j`WyfaLk6Zk{TIZIrf0Iwf!05h|TmFfnjuF`c"
+    "_QrKK#SUme7NrK8zM`z>8qand9}mTp-SElmN&_h~deU{N5~6XnF}zYj2QF(g{$&n?YMmG}1n"
+    "b~iCrbq3p*o4T@?SUVi*>f0^OzIl2({5fAL;%9UEMs8|ClAQwcbz-"
+    "u4S%i8NjyY|EDeGAlms7?hE=fhIqEfzwWf{x@L9NgQ`EF!>R{#$Q50m{QIZ3UF_j!=8eJ>%Z"
+    "@4^H*$;3xD){&LF&sNP;TSE@SdhSt7r6LhiTjc2DEjvptL*6W4-"
+    "{$kArWNoL;`=ou;%2=cuv+jjFtt_f8=RdqhYn?$`Gwg4d2S(fBX_~Id;_6FfJl*_c_1U&8aL"
+    "tz>!9#pXF3Y$rz3mI07ig_SXti$T=7WNGqKfvNsUsJEJvrN-_xQ?OaZu)w{37VLrbTgB~_dM"
+    "`>u4NKJO1_(Y;+}=;LtNv(M5MSfIZ2L;!I4rZ>`f>1u@ua4p}MlF!_akbDNu#9d{maJ#5*k5"
+    "04-+eNVe-Ww*{)3fQYX$Xj4wMl8PbR>S2CiX235X9yog;7gyrlar#TXlvlh2&CP$85{?4O}W"
+    "CO}JcyWvKxyVo&8sac4Ykf|&<Td+)ZSF+ZKPv>;cfJb-GGJBK$7o81G7T%+1FTOD)<e{^<!h"
+    ">DxKOMP9n<yD=0PbNTOQjc!_hvb-@@6pqeuRp6UKf7Yp35tjYq6G-"
+    "e1c#Q**dHy3ECgeKJm_PjLpX-"
+    "x;#9K1y7xTs(Nmz#nUQ(ze8Jwp>poP<T+&STPfnCmEgLqtgm_yIy-C(M%D-"
+    ";Q*!8cKZaYZFM-"
+    "p|7=F^6$CBntRdVHt=AgAUnFRst8zllf$<+XSoD|8U}Dvq)>`3z?XjI}4Ka*hQxGE?tx&p1|"
+    "?rVr-ef3+>E_~9WFx^IPi-"
+    "1hOD(?BkLbZ;zZc3z;;+=ZYt40rBq4+X7p{f%|8(e6V1KH^xjq=zcl`l*Km;BOolM;F@AdZ&"
+    "ep#57{KGt+RUwG~i~w*O7bR^Q_Bwj3BI0X0Fd$*$Qw9youu;Giino)%xj<PBy4S0)?ltchEu"
+    "R=LLQ^FUj19DQeS;<LVcaRryuJ*y0t;cE9rKS~FNz+(Y+T)}CRLyfw5<6|k3{;cQs&bw`#TN"
+    "Bp=TN69#TNA4hkdeIO*^#`sXp*~XlmijLi>9JERA209|Cuq=UHWfkTt6~rZl4REyf{;<^TG&"
+    "iO8;8cG2yW9-X#Q1XF(Gnv2|MdyQT|JX6*~!);nUOguCy1?mfY?nDjiF-"
+    "}YIpHe^ULG6P6wdp`j3kL%j@7lfvF-MQ_Ii6UqF{E56P*V*<LUel<vsf!2~kQiU%7y;;ahs2"
+    "12@RH`Ag@_T^f7mM3fnP~u1uX6*uRGN)rX#q7Eu-"
+    "Zn)hD^%T1V$7s+3&dq2MbSFyZUIcSSBhQ`+U?Ftq|5Xf@AAt9}1co-kV?&Jx^GiK?tvIOt#c"
+    "fuK(c(>j`!ZWN3If$ExVzah^N<5LcD{-hv5fx8A|g|C)(Dyk^$Gm&oL*RI5_rt6;@-"
+    "+5=&A|+7pM#kGrICG{XyBel&@Z3v0m#vGMcBVa*u-"
+    "}NnN%Q>;h74k2aQ5kwpVobxPZ}bh$alG=rM3Bo<L0M}`Iz>M&Tz}_1MQpLNVqm!V(|7A(}%$"
+    "mvmZ=iID@Xf<#<Z{`Y65qkZHQL&7UrFXMgm}QxvdrAZ9+dzq?tSo$W_h%NB`PFIo`n2Z^%OA"
+    "#2Pzxqwds44p-FXxY6B(-"
+    "M<1EKtuoc=Zy6U)ovv4O|bd>lu{6eNj7p@)aBYny0!VzdHN1jGT;NE34%(KB%Eka?iJ({qrh"
+    "^riloWqwYp&5CVnYVQ9y>TRbH+vywZvKk=)kDXJ+}apQ!s4GM`sv6XL9c{gQ*oYjO;K*_m}2"
+    "2~u)?pxz9G~^_M*RcZyPYUu)bU<-"
+    "6VEo%kMvP=?toRTNP<X_$iB=O1>Zy~{*zslG<!O2)kG&LQgWoSPP@S4nSkcL6)6`ZqJ=>a{="
+    "8TzqKf*WfRc|_SM3|G3F0Caqxl2v@jxVFFZY6YcQ!nk5xu;AClyLI>*eQ^M#E^u=Nq1xJHX="
+    "NPs1PI*JSb*Kl<884-"
+    "ub+ZyrY&*jKJ8(O{qp=h4fdB9$#L3Rr9AJl|%C3!&eD;6*|F;b?q%|FrF^bVdVI=GEb?bUI^"
+    "mqB_X<h$#fYNXMok4kAV&^C#Ed*HehE<imdWgKY*N_Le?WEzIuKs4^xg`)B1JI4r+rDc}c9T"
+    "Wk-&DluW-PqHGfxD}o?jj?`Pkol9++8266?e68@e4tc>Fp5%(?Ki<cj32l866%VAXCqQ;{EC"
+    "F$aF5@WwA^9DE2tUmhKiFS>11WGQ%de~FsYf0<ioUxZ7vZ6_JSD=le}!d2G@Fz9{SWHfYVOU"
+    "{=MiqR$Qem@Un`yp1;fhQ%Fx_Ny|J_qn=P$^9W7>mPnk;6#cr0A=2=F6ysDaoqV>^D17y&=x"
+    "%BGgNj)5&QPcPWrX!jpU!XW~Ff2jue(EY}>ihPJU(X@{NTc>4&eV|UhGS+0$INXfsB3yQgA9"
+    "7K;omZ6DAg#x5JOb^3>j_r7QLP6Mch}jvVG$&3|#x-O?_3<@C<77`Gr6j$we}yhc#-"
+    ">BA7ebE<YVIc*WY$={=f-a!`xcu`39AeI-a110dzh1p>Uh!LYT1-"
+    "_*oV0^WOfY&ii`0H18RykTza{aO#3TsC-NCf*c-"
+    ";rNi&<Nzc9SbzYGko56>K>C+GhCn1Tq)$=RiEz6J-"
+    "`>q5jdBCfVE9nUY@my<LZ&r`Q<mt!08}zGvAR{&U3js%gg96}gf$(#K^VXw3~ELloX?<7SpG"
+    "Hp9g}f3r^$0J><MweG++#X5ATTEb$)gFjHtQcU+z-"
+    "$JR)*`+<PSTx+vzS|8IlEu5@4Cm%*Yf?BCUg8QAot^l)@xH3d7H|5-xEB#zkpHGmC$3Z7g^-"
+    "4defasR}u!>#&OULGQmL6z@CUe<7a-"
+    "LL$U${tsLmDAD{G3CqqicKP)_*u<xGk*ClN5;a1_q+DoDj-"
+    "!X3eF&U+fNeSNLKGxS5ubM9E97w_Pb<(<kk%wfzDca`q8l_#5ZVMDCurSx>Y>0wz!fOkGO&Z"
+    "q6@f=2|F5<<Q&};z1eJT!I&f|LFn?=TklvgUhMyx20@V{Xx#2qP48%+NDEm*v^OH}qz2!FeL"
+    "UPem(pysSN)Jn&?+A52-Jo_3Brh0$^u`q1Q#_sXIqwRCZJ<O0HKDyZDnM@{n>-ul0Zg!-"
+    "MQW==2__xAMo}E*<Ridy-"
+    "r+Cj+Toio+rD~xtuNzqXb?0#OY?iqCdAk?yrqRf1)T%>J5|)Io0c9=o9HB`oFboEC<B!f6+4"
+    "L%lH=Ke{0#;(ebabZDO~>A{%PhG29(m*ilSYHC>q4dv+>DulZVl+~OCS={i*%9I4sb>x*FfK"
+    "DV|UFG~L>GSPU=CjE^sxLEwCq1rXh3F5Wdt&R+Ry{AWKnM2`9bTNZ~(A~hkD(FrA6_Aq3T})"
+    "^0Ml7^6eM3h6GdEY*dwg=&m>M?jFze7gs=D&5P?8^M2(Tj+LY)Z{>>*fRNBDSgGzOJMa_x2V"
+    "Np5ye=Vi(AX0Gu&zJ!q=JdP}cguJm76+kf<Hdi~GAnk%u4R(yBd?@~96!X!(r}SkMn(XuDyY"
+    "L^z*4`Uf)-"
+    "z|t@FRb4IQ!>eXi?moA|Yf+)YI@|Yb!R=6PSV`lKgru6uALOiC_4_6plIE=e&domo5bhvc&5"
+    "X!I*Ke!V||fU@U*Jb_1+9RP5sr7yO&zbOq>nA*7>eUJBc*YLocUbv>Q*Cnh9py?v}HU*J29c"
+    "#EW9jW_OhUl93icW0FnpSb7MgCTzGGoNp>!D{7Mji<=ULnZy~-"
+    "N+qCRRIPT2k?J0+W+qr00a2%{Pynxe&=BS5fBISFGluv;O{);KfprR|6nbD2mj8h`~&7h`2T"
+    "S%zsvcZZ1_ix8RGv<J^U`^_sR7?QuKlUb&mbJfZsd&e+2kp{MP6H4*k8S`UfhC{a-"
+    "q)|4_hhLGd4W2ho2Ck-x)#_x69_lqCP@`>G1?2!B3BetG-8{NV)YpFjQ|AznS~"
 )
 EMPTY_XLSM_BYTES: bytes = zlib.decompress(base64.b85decode(_EMPTY_XLSM_B85))

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/src/pyopenvba/_templates/blank_files/blank_database.accdb RENAMED Viewed

Binary file

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/src/pyopenvba/_templates/blank_files/blank_workbook.xlsm RENAMED Viewed

Binary file

{pyopenvba-6.3.1 → pyopenvba-6.3.3}/src/pyopenvba/forms.py RENAMED Viewed

@@ -258,6 +258,23 @@ class VBAForm:
         default_factory=lambda: [], repr=False
     )
     _header_edited: bool = field(default=False, repr=False)
+    _layout_dpi: int = field(default=96, init=False, repr=False)
+    @property
+    def layout_dpi(self) -> int:
+        """Target designer DPI for newly laid-out controls and pages (default 96).
+        Other DPIs use estimates scaled from measured 96-DPI font metrics.
+        This setting is not stored in the file and does not change existing
+        geometry or fonts. Set it again after reopening a form.
+        """
+        return self._layout_dpi
+    @layout_dpi.setter
+    def layout_dpi(self, value: int) -> None:
+        if type(value) is not int or value <= 0:
+            raise ValueError("layout_dpi must be a positive integer")
+        self._layout_dpi = value
     @property
     def properties_set(self) -> int:
@@ -377,7 +394,7 @@ class VBAForm:
         self._count_shape(level)
         font = self._font_of(level)
-        default_w, default_h = _default_size(kind, font)
+        default_w, default_h = _default_size(kind, font, self.layout_dpi)
         size_w = default_w if width is None else points_to_himetric(width)
         size_h = default_h if height is None else points_to_himetric(height)
         site = _new_site(
@@ -648,17 +665,19 @@ class VBAForm:
     def _page_box(self, level: _Level, size: Size) -> tuple[int, int, int, int]:
         """Where the designer lays out a page of the MultiPage at ``level`` in a TabStrip of ``size``, and
-        the page's size: two pixels inside the TabStrip's border and under its tabs, whose height follows
-        the MultiPage's font (tests/fixtures/form_fonts.json).  The designer rounds the TabStrip to whole
-        pixels at 96 DPI and turns each pixel edge back into HIMETRIC at the TabStrip's own HIMETRIC per
-        pixel, so the page's top moves a unit or two with the size (tests/fixtures/multipage_resize.json).
-        Left, top, width, height, in HIMETRIC."""
-        wide = max(1, _mul_div(size.width, 96, 2540))
-        tall = max(1, _mul_div(size.height, 96, 2540))
-        under = _PAGE_INSET_PX + _tab_band_px(self._multipage_font(level))
-        left, top = _mul_div(_PAGE_INSET_PX, size.width, wide), _mul_div(under, size.height, tall)
-        right = _mul_div(wide - _PAGE_INSET_PX, size.width, wide)
-        bottom = _mul_div(tall - _PAGE_INSET_PX, size.height, tall)
+        the page's size: a scaled two-pixel inset under the tabs in the MultiPage's font.
+        At 96 DPI this is measured (tests/fixtures/form_fonts.json and multipage_resize.json);
+        other DPIs use scaled estimates. Round the TabStrip to whole target pixels and turn
+        each edge back into HIMETRIC at its own HIMETRIC per pixel, so the page's top
+        moves a unit or two with the size. Left, top, width, height, in HIMETRIC."""
+        dpi = self.layout_dpi
+        wide = max(1, _mul_div(size.width, dpi, 2540))
+        tall = max(1, _mul_div(size.height, dpi, 2540))
+        inset = _mul_div(_PAGE_INSET_PX, dpi, 96)
+        under = inset + _tab_band_px(self._multipage_font(level), dpi)
+        left, top = _mul_div(inset, size.width, wide), _mul_div(under, size.height, tall)
+        right = _mul_div(wide - inset, size.width, wide)
+        bottom = _mul_div(tall - inset, size.height, tall)
         return left, top, right - left, bottom - top
     def _multipage_font(self, level: _Level) -> _Font:
@@ -1567,18 +1586,22 @@ _TAB_BAND_PX: dict[tuple[str, int], int] = {
 }
-def _tab_band_px(font: _Font) -> int:
-    """A tab's height in pixels for ``font``: as measured, or else estimated
-    from the size alone, which reproduces every Tahoma size measured and is
-    within a pixel of the rest."""
+def _tab_band_px(font: _Font, dpi: int = 96) -> int:
+    """Measured at 96 DPI; scaled estimates elsewhere, including pixel rounding.
+    Unknown fonts use an estimated line height plus scaled tab padding.
+    This is deterministic, not a query of the machine's installed fonts.
+    """
     twips = font.size // 500
     measured = _TAB_BAND_PX.get((font.name.casefold(), twips))
-    return measured if measured is not None else round(twips / 15 * 1.2) + 6
+    if measured is not None:
+        return _mul_div(measured, dpi, 96)
+    return round(twips / 15 * 1.2 * dpi / 96) + _mul_div(6, dpi, 96)
-def _himetric_px(pixels: int) -> int:
-    """Pixels at 96 DPI in HIMETRIC, rounded as the designer rounds them."""
-    return round(pixels * 2540 / 96)
+def _himetric_px(pixels: int, dpi: int = 96) -> int:
+    """Target-display pixels in HIMETRIC, with the measured 96-DPI rounding."""
+    return round(pixels * 2540 / dpi)
 def _mul_div(number: int, numerator: int, denominator: int) -> int:
@@ -1587,13 +1610,14 @@ def _mul_div(number: int, numerator: int, denominator: int) -> int:
     return (2 * number * numerator + denominator) // (2 * denominator)
-def _default_size(kind: str, font: _Font) -> tuple[int, int]:
+def _default_size(kind: str, font: _Font, dpi: int = 96) -> tuple[int, int]:
     """The size the designer gives a new control of ``kind`` on a container
     showing ``font``: the kind's own, but a CheckBox or OptionButton at
-    least 24 pixels tall and four more than a tab in its font."""
+    least 24 baseline pixels tall and four more than a tab in its font.
+    Baseline pixels scale from 96 DPI before rounding to target pixels."""
     width, height = _DEFAULT_SIZE.get(kind, _DEFAULT_SIZE["CommandButton"])
     if kind in _FONT_HEIGHTED:
-        height = _himetric_px(max(24, _tab_band_px(font) + 4))
+        height = _himetric_px(max(_mul_div(24, dpi, 96), _tab_band_px(font, dpi) + _mul_div(4, dpi, 96)), dpi)
     return width, height
 # MorphData's PropMask bit 31 is reserved and MUST be 1

pyOpenVBA 6.3.1__tar.gz → 6.3.3__tar.gz

pyOpenVBA 6.3.1tar.gz → 6.3.3tar.gz