CTAN sync 202207140300

1 files changed, 21 insertions, 21 deletions

diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
index d8b2a0a851..2f1b2ffa49 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
@@ -287,7 +287,7 @@ vardef OvalMenuCap(expr art)=OvalCapMenu(art) enddef;
 vardef OvalCapMenu(expr ar)=
   save $; picture $;
   string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TAMC;
   TAMC=OvalBox(TTm);
@@ -317,8 +317,8 @@ enddef;
 vardef OvalMouvMenu(expr ar)=
   save $;  picture $;
   path ta; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else:
-      "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}"
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else:
+      "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}"
   fi;
   ta=OvalBox(TTm);
   $=image(
@@ -332,7 +332,7 @@ enddef;
 vardef OvalAppMenu(expr ar)=
   save $;  picture $;
   path ta; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   ta=OvalBox(TTm);
   $=image(
@@ -349,7 +349,7 @@ vardef OvalMenuSon(expr ar)=
   save $; save TA;
   picture $;
   string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TA;
   TA=OvalBox(TTm);
@@ -365,7 +365,7 @@ vardef OvalMenuControle(expr ar)=
   save $; save TA;
   picture $;
   string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TA;
   TA=OvalBox(TTm);
@@ -383,11 +383,11 @@ vardef OvalStylo(expr ar)=
   string TT,TTI;
   if string ar:
     if print:
-      TT=ar&"\hbox to1em{\barre}\blacktriangledown"
+      TT=ar&"\hbox to1em{}\barre\blacktriangledown"
     else:
-      TT=ar&"\hbox to1em{\barre}{\color{white}\blacktriangledown}"
+      TT=ar&"\hbox to1em{}\barre{\color{white}\blacktriangledown}"
     fi;
-    TTI=ar&"\hbox to1em{\barre}\phantom{\blacktriangledown}";
+    TTI=ar&"\hbox to1em{}\barre\phantom{\blacktriangledown}";
     path TA;
     TA=OvalBox(TT);
     $=image(
@@ -420,7 +420,7 @@ vardef OvalMenuEvenement(expr ar)=
   save $; save TA;
   picture $;
   string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TA;
   TA=OvalBox(TTm);
@@ -436,7 +436,7 @@ enddef;
 vardef RecMouvMenu(expr ar)=
   save $;  picture $;
   path ta; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}"
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}"
   fi;
   ta=RecBox(TTm);
   $=image(
@@ -450,7 +450,7 @@ enddef;
 vardef RecMenuApp(expr ar)=
   save $;  picture $;
   save ta; path ta; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   ta=RecBox(TTm);
   $=image(
@@ -464,7 +464,7 @@ enddef;
 vardef RecMenuOp(expr ar)=
   save $; save TA;
   picture $; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TA;
   TA=RecBox(TTm);
@@ -479,7 +479,7 @@ enddef;
 vardef RecMenuSon(expr ar)=
   save $; save TA;
   picture $; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}" fi;
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}" fi;
   path TA;
   TA=RecBox(TTm);
   $=image(
@@ -493,7 +493,7 @@ enddef;
 vardef RecEvenementMenu(expr ar)=
   save $;  picture $;
   path ta; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   ta=RecBox(TTm);
   $=image(
@@ -507,7 +507,7 @@ enddef;
 vardef RecMenuCap(expr ar)=
     save $;  picture $;
   path ta; string TTm;
-    TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+    TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
     fi;
   ta=RecBox(TTm);
   $=image(
@@ -521,7 +521,7 @@ enddef;
 vardef RecMenuVar(expr ar)=
   save $; save TA;
   picture $; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TA;
   TA=RecBox(TTm);
@@ -536,7 +536,7 @@ enddef;
 vardef RecMenuList(expr ar)=
   save $; save TA;
   picture $; string TTm;
-  TTm=if print:ar&"\hbox to1em{\barre}\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:ar&"\hbox to1em{}\barre\blacktriangledown" else: "{\color{white}"&ar&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   path TA;
   TA=RecBox(TTm);
@@ -1654,7 +1654,7 @@ vardef FinBlocRepeter=
   drawoptions();
   texto=image(
       labeloffset:=0;
-    label.lrt(TEX("\hbox to"&decimal(LongRep[numblocrep])&"pt{\phantom{\barre fin du bloc}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+    label.lrt(TEX("\barre\hbox to"&decimal(LongRep[numblocrep])&"pt{~~}"),if unknown _coinprec: (0,0) else:_coinprec fi);
   labeloffset:=3;
   );
 path cadre;
@@ -1973,7 +1973,7 @@ vardef Stop(expr nbpas)=
   save $;
   picture $,texto;
   string TTm;%Pour sauvegarder le nbpas car en l'utilisant dans les if, il ne permet pas la concaténation...
-  TTm=if print:nbpas&"\hbox to1em{\barre}\blacktriangledown" else:"{\color{white}"&nbpas&"\hbox to1em{\barre}\blacktriangledown}";
+  TTm=if print:nbpas&"\hbox to1em{}\barre\blacktriangledown" else:"{\color{white}"&nbpas&"\hbox to1em{}\barre\blacktriangledown}";
   fi;
   texto=image(
       path ti;
@@ -3138,7 +3138,7 @@ vardef TestOpContient(expr pasun,pasdeux)=
   save $; picture $;
   save TAa; path TAa;
   save LTa; picture LTa;
-  LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"contient",if string pasun : OvalNb(pasdeux) else: pasun fi,"?");
+  LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"contient",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi,"?");
   TAa=DiamondBox(LTa);
   $=image(
       fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi;