diff options
author | Norbert Preining <norbert@preining.info> | 2023-11-14 03:01:05 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-11-14 03:01:05 +0000 |
commit | e20928a0f9f4a7faa8bb21915e761e11e34f04ff (patch) | |
tree | 32b28652fc038d4e06485fe1eb5a25517d15ef87 /macros/latex/contrib/profcollege/metapost | |
parent | 88ed039ed13674ce7440cc57dba288cf166796fe (diff) |
CTAN sync 202311140301
Diffstat (limited to 'macros/latex/contrib/profcollege/metapost')
-rw-r--r-- | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp | 11 | ||||
-rw-r--r-- | macros/latex/contrib/profcollege/metapost/PfCScratch.mp | 22 |
2 files changed, 24 insertions, 9 deletions
diff --git a/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp b/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp index 37f4809598..bada2c141a 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp @@ -56,6 +56,17 @@ _tn:=0; pair _t[]; color _T[]; +%%%%%%%%% +%Labelisation spéciale :) +% +vardef Labelcp(suffix a)(expr s,z) = + save p; picture p; + if picture s: p=s + else: p = s infont defaultfont scaled defaultscale + fi; + draw p shifted (z + 2*labeloffset*unitvector(z-a)-center p) +enddef; + %%----------------------------------------------- %% Procedures d'affichage %%----------------------------------------------- diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp index d0dbad1a25..f60928745c 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp @@ -1910,8 +1910,12 @@ vardef Sinon= $=image( fill cadre withcolor if print=true : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; draw cadre withcolor if print=true : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; - drawoptions(withcolor white); - label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto))); + if print: + label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto))); + else: + drawoptions(withcolor white); + label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto))); + fi; drawoptions(); if BlocStopAvant=false: draw (coindebutbloc[numblocrep]+(0.0625+0.5cm,0)+(eb,0.125)){dir180}.. @@ -2456,13 +2460,13 @@ TEXT=image( path cadre; cadre=CADRE(texto); fill cadre withcolor white; - draw %(urcorner texto+(0,eb))-- - (ulcorner texto+(0.625cm,0)+(eb,eb)){dir180}.. - {dir180}(ulcorner texto+(0.625cm,0))-- - (ulcorner texto+(0.375cm,0)){dir180}.. - {dir180}(ulcorner texto+(0.375cm,0)+(-eb,eb)) - %--(ulcorner texto+(0,eb)) - withpen pencircle scaled 0.01; + %draw %(urcorner texto+(0,eb))-- + % (ulcorner texto+(0.625cm,0)+(eb,eb)){dir180}.. + % {dir180}(ulcorner texto+(0.625cm,0))-- + % (ulcorner texto+(0.375cm,0)){dir180}.. + % {dir180}(ulcorner texto+(0.375cm,0)+(-eb,eb)) + % %--(ulcorner texto+(0,eb)) + % withpen pencircle scaled 0.01; draw texto; ); $=TEXT shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner TEXT); |