diff options
Diffstat (limited to 'macros/latex/contrib/profcollege/metapost')
3 files changed, 48 insertions, 10 deletions
diff --git a/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp b/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp index e53e8f87f0..7b98805397 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp @@ -1455,6 +1455,11 @@ enddef; vardef FinBlocRepeterI=FinBlocRepeter enddef; +vardef BlocUserFinRepeter(expr col)= + colControle:=col; + FinBlocRepeter +enddef; + vardef Si(expr xa)= LONG:=0; save $; @@ -1951,8 +1956,9 @@ vardef BlocGrisMulti(text argris)= $ enddef; -boolean BlocE; +boolean BlocE,BlocR; BlocE:=false; +BlocR:=false; vardef BlocUser(expr colblocuser)(text textbloc)= LONG:=0; @@ -1964,7 +1970,17 @@ vardef BlocUser(expr colblocuser)(text textbloc)= texto=image( draw BUTB; ); - $=Affichage(texto); + ColBloc:=colblocuser; + if BlocE: + $=AffichageED(texto); + elseif BlocR: + LONG:=0; + numblocrep:=numblocrep+1; + LongRep[numblocrep]:=abs(llcorner texto-lrcorner texto);%afin de conserver la longueur du"répéter..." + $=AffichageControle(texto); + else: + $=Affichage(texto); + fi; $ enddef; diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp index 2f1b2ffa49..2f2db0ee74 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp @@ -1712,6 +1712,11 @@ enddef; vardef FinBlocRepeterI=FinBlocRepeter enddef; +vardef BlocUserFinRepeter(expr col)= + colControle:=col; + FinBlocRepeter +enddef; + vardef Si(expr xa)= LONG:=0; save $; @@ -2510,8 +2515,9 @@ vardef BlocGrisMulti(text argris)= $ enddef; -boolean BlocE; +boolean BlocE,BlocR; BlocE:=false; +BlocR:=false; vardef BlocUser(expr colblocuser)(text textbloc)= LONG:=0; @@ -2524,10 +2530,15 @@ vardef BlocUser(expr colblocuser)(text textbloc)= draw BUTB; ); ColBloc:=colblocuser; - if BlocE=false: - $=Affichage(texto); - else: + if BlocE: $=AffichageED(texto); + elseif BlocR: + LONG:=0; + numblocrep:=numblocrep+1; + LongRep[numblocrep]:=abs(llcorner texto-lrcorner texto);%afin de conserver la longueur du"répéter..." + $=AffichageControle(texto); + else: + $=Affichage(texto); fi; $ enddef; diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp b/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp index 87a59ce750..f96556d032 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp @@ -1744,6 +1744,11 @@ enddef; vardef FinBlocRepeterI=FinBlocRepeter enddef; +vardef BlocUserFinRepeter(expr col)= + colControle:=col; + FinBlocRepeter +enddef; + vardef Si(expr xa)= LONG:=0; save $; @@ -2542,8 +2547,9 @@ vardef BlocGrisMulti(text argris)= $ enddef; -boolean BlocE; +boolean BlocE,BlocR; BlocE:=false; +BlocR:=false; vardef BlocUser(expr colblocuser)(text textbloc)= LONG:=0; @@ -2556,10 +2562,15 @@ vardef BlocUser(expr colblocuser)(text textbloc)= draw BUTB; ); ColBloc:=colblocuser; - if BlocE=false: - $=Affichage(texto); - else: + if BlocE: $=AffichageED(texto); + elseif BlocR: + LONG:=0; + numblocrep:=numblocrep+1; + LongRep[numblocrep]:=abs(llcorner texto-lrcorner texto);%afin de conserver la longueur du"répéter..." + $=AffichageControle(texto); + else: + $=Affichage(texto); fi; $ enddef; |