summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-07-05 03:01:54 +0000
committerNorbert Preining <norbert@preining.info>2023-07-05 03:01:54 +0000
commit973c785dccc1812d63162178e8362e83e8c263c2 (patch)
treeb2cb12a6b36a0a59e90f1611d32cf7e8d125d575 /macros/latex/contrib/profcollege/metapost/PfCScratch.mp
parentab7f5e4df027c13f5aef4fbdb032184cf2f3d5c3 (diff)
CTAN sync 202307050301
Diffstat (limited to 'macros/latex/contrib/profcollege/metapost/PfCScratch.mp')
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCScratch.mp51
1 files changed, 31 insertions, 20 deletions
diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
index b3edc8af1f..18fe1c904a 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
@@ -15,7 +15,6 @@ numeric Nblignes; Nblignes:=1;
pair DebutListe; DebutListe=(0,0);
boolean NumeroteLignes; NumeroteLignes=false;
boolean NumeroteFinBloc; NumeroteFinBloc=false;
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% couleurs
color CoulLignes; CoulLignes:=black;
color ColBloc; % alias des couleurs de bloc
@@ -57,7 +56,7 @@ def Place expr o =
enddef;
def Placer expr o =
- if path o: draw o else: draw o fi
+ if path o: draw o else: draw o fi;
enddef;
%impression
@@ -819,8 +818,8 @@ enddef;
vardef Tournerg(expr nbpas)=
LONG:=0;
- save $;
- picture $, texto;
+ save Tourner;
+ picture Tourner, texto;
if string nbpas:
if symbole=true:
texto=ColleBoxNew("tourner",Arcgauche,"de",OvalNb(nbpas),"degré(s)");
@@ -835,8 +834,8 @@ vardef Tournerg(expr nbpas)=
fi;
fi;
ColBloc:=BleuMouvTrois;
- $=Affichage(texto);
- $
+ Tourner=Affichage(texto);
+ Tourner
enddef;
vardef Orienter(expr nbpas)=
@@ -1398,8 +1397,8 @@ vardef NoteImage=
save $;
picture $;
$=image(
- linecap := butt;
- linejoin := mitered;
+% linecap := butt;
+% linejoin := mitered;
fill (80.695297,716.262024)..controls (80.574203,716.257996) and (80.476601,716.171997)..(80.480499,716.062988)
--(80.687500,704.125000)..controls (79.941399,704.570007) and (78.644501,704.637024)..(77.312500,704.223022)
..controls (75.503899,703.659973) and (74.339798,702.429993)..(74.710899,701.473022)
@@ -1548,8 +1547,8 @@ vardef CrayonImage=
picture cray;
cray=image(%
drawoptions (if print=false:withcolor (0.298050,0.556850,0.917650) fi);
- linecap := butt;
- linejoin := mitered;
+% linecap := butt;
+% linejoin := mitered;
fill (0.960938,1.390630)--(1.644530,2.996090)..controls (1.730470,3.199220) and (1.917970,3.500000)..(2.062500,3.664060)..controls (2.324220,3.968750) and (3.539060,2.753910)..(3.234380,2.488280)..controls (3.070310,2.343750) and (2.769530,2.160160)..(2.566410,2.074220)--cycle;
drawoptions (withcolor (0.349030,0.368640,0.450970));
pickup pencircle scaled 0.498140bp;
@@ -2197,8 +2196,8 @@ enddef;
vardef DrapeauImage=
save $; picture $;
$=image(
- linecap := butt;
- linejoin := rounded;
+% linecap := butt;
+% linejoin := rounded;
if print = false: drawoptions(withcolor(76/255,191/255,86/255)) fi;
fill (72.000000,713.254028)--(72.000000,718.918030)--(72.507797,718.979980)
--(72.984398,719.026978)--(73.437500,719.054993)--(73.867203,719.070007)
@@ -2350,7 +2349,7 @@ vardef CommandeVide(expr commande)=
picture $,texto,TEXT;
if string commande :
texto=image(
- label.lrt(TEX("\barre \hbox to"&commande&"cm{}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+ label.lrt(TEX("\sffamily\bfseries\longbarre \hbox to"&commande&"cm{}"),if unknown _coinprec: (0,0) else:_coinprec fi);
);
else:
texto=commande;
@@ -2365,18 +2364,12 @@ vardef LigneVide=
save $;
picture $,texto,TEXT;
texto=image(
- label.lrt(TEX("\barre \hbox to2cm{}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+ label.lrt(TEX("\sffamily\bfseries\longbarre \hbox to4cm{}"),if unknown _coinprec: (0,0) else:_coinprec fi);
);
TEXT=image(
path cadre;
cadre=CADRE(texto);
unfill cadre;
- %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;
);
$=TEXT shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner TEXT);
_coinprec:=llcorner $;
@@ -2390,6 +2383,7 @@ fi;
$
enddef;
+
vardef LigneVideVar(expr commande)=
LONG:=0;
save $;
@@ -2415,6 +2409,7 @@ TEXT=image(
(ulcorner texto+(0.375cm,0)+(-eb,eb))--
(ulcorner texto+(0,eb))--(ulcorner texto+(-eb,0))--cycle;
fill cadre withcolor white;
+ draw cadre;
% draw (urcorner texto+(0,eb))--
% (ulcorner texto+(0.625cm,0)+(eb,eb))--
% (ulcorner texto+(0.625cm,0))--
@@ -2434,6 +2429,22 @@ fi;
$
enddef;
+vardef LigneVideVarUn(expr commande)=
+ LONG:=0;
+ save $;
+ picture $,texto,TEXT;
+ if string texto:
+ texto=image(
+ label.lrt(TEX("\barre \hbox to2cm{}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+ );
+else:
+ texto=commande;
+fi;
+ColBloc:=white;
+$=Affichage(texto);
+$
+enddef;
+
vardef LignePointilles=
LONG:=0;
save $;