diff options
author | Karl Berry <karl@freefriends.org> | 2023-11-14 21:04:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-11-14 21:04:10 +0000 |
commit | 921cdbd26fb0af5720b0a00b412cd9bd3cfb625a (patch) | |
tree | 44754e1da00f51657c99f9ce039a29ddb730179c /Master/texmf-dist/metapost | |
parent | 830ca3622cd4bfe82812703c57c3af1971150bf8 (diff) |
profcollege (14nov23)
git-svn-id: svn://tug.org/texlive/trunk@68841 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/metapost')
-rw-r--r-- | Master/texmf-dist/metapost/profcollege/PfCGeometrie.mp | 11 | ||||
-rw-r--r-- | Master/texmf-dist/metapost/profcollege/PfCScratch.mp | 22 |
2 files changed, 24 insertions, 9 deletions
diff --git a/Master/texmf-dist/metapost/profcollege/PfCGeometrie.mp b/Master/texmf-dist/metapost/profcollege/PfCGeometrie.mp index 37f48095984..bada2c141a9 100644 --- a/Master/texmf-dist/metapost/profcollege/PfCGeometrie.mp +++ b/Master/texmf-dist/metapost/profcollege/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/Master/texmf-dist/metapost/profcollege/PfCScratch.mp b/Master/texmf-dist/metapost/profcollege/PfCScratch.mp index d0dbad1a251..f60928745cb 100644 --- a/Master/texmf-dist/metapost/profcollege/PfCScratch.mp +++ b/Master/texmf-dist/metapost/profcollege/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); |