From 363b3ba3a8cde41ccf198aebb78604e19e3620ba Mon Sep 17 00:00:00 2001 From: Christophe Poulain Date: Thu, 16 Feb 2017 22:12:26 +0100 Subject: [PATCH] Modification des blocs Dire; DireT, Penser, PenserT --- src/Apparence.mp | 8 ++++---- src/LATEXScratch.mp | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Apparence.mp b/src/Apparence.mp index ed7a6d8..bd7b977 100644 --- a/src/Apparence.mp +++ b/src/Apparence.mp @@ -24,7 +24,7 @@ vardef DireT(expr phrase,tps)= save $; picture $,texto; texto=image( - label.lrt(LATEX("\bfseries\color{white}dire \colorbox{white}{\textcolor{black}{\normalfont "&phrase&"}} pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi); + label.lrt(LATEX("\bfseries\color{white}dire "&phrase&" pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi); ); $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA); _coinprec:=llcorner $; @@ -36,7 +36,7 @@ vardef Dire(expr phrase)= save $; picture $,texto; texto=image( - label.lrt(LATEX("\bfseries\color{white}dire \colorbox{white}{\normalfont\textcolor{black}{"&phrase&"}}"),if unknown _coinprec: (0,0) else:_coinprec fi); + label.lrt(LATEX("\bfseries\color{white}dire "&phrase&""),if unknown _coinprec: (0,0) else:_coinprec fi); ); $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA); _coinprec:=llcorner $; @@ -48,7 +48,7 @@ vardef PenserT(expr phrase,tps)= save $; picture $,texto; texto=image( - label.lrt(LATEX("\bfseries\color{white}penser \colorbox{white}{\normalfont\textcolor{black}{"&phrase&"}} pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi); + label.lrt(LATEX("\bfseries\color{white}penser "&phrase&" pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi); ); $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA); _coinprec:=llcorner $; @@ -60,7 +60,7 @@ vardef Penser(expr phrase)= save $; picture $,texto; texto=image( - label.lrt(LATEX("\bfseries\color{white}penser \colorbox{white}{\normalfont\textcolor{black}{"&phrase&"}}"),if unknown _coinprec: (0,0) else:_coinprec fi); + label.lrt(LATEX("\bfseries\color{white}penser "&phrase&""),if unknown _coinprec: (0,0) else:_coinprec fi); ); $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA); _coinprec:=llcorner $; diff --git a/src/LATEXScratch.mp b/src/LATEXScratch.mp index 8e88b3c..3ec7f90 100644 --- a/src/LATEXScratch.mp +++ b/src/LATEXScratch.mp @@ -11,16 +11,13 @@ vardef LATEX primary s = write "\usepackage[autolanguage]{numprint}" to "mptextmp.mp"; write "\usepackage{amssymb}" to "mptextmp.mp"; write "\usepackage{xcolor}" to "mptextmp.mp"; -% write "\definecolor{LightGreen}{rgb}{0.625,1,0.250}" to "mptextmp.mp"; write "\definecolor{DarkGreen}{rgb}{0.359,0.715,0.070}" to "mptextmp.mp"; write "\definecolor{dDarkGreen}{rgb}{0.328,0.656,0.0625}" to "mptextmp.mp"; write "\definecolor{mLightBlue}{rgb}{0.266,0.387,0.762}" to "mptextmp.mp"; -% write "\definecolor{LightBlue}{rgb}{0.172,0.645,0.883}" to "mptextmp.mp";%0.75,0.875,1 write "\definecolor{DarkBlue}{rgb}{0.289,0.422,0.828}" to "mptextmp.mp";%0.5,0.75,1 write "\definecolor{cDarkBlue}{rgb}{0.172,0.645,0.883}" to "mptextmp.mp"; write "\definecolor{cLightBlue}{rgb}{0.156,0.590,0.809}" to "mptextmp.mp"; write "\definecolor{dDarkBlue}{rgb}{0,0.375,0.75}" to "mptextmp.mp"; - %write "\definecolor{LightViolet}{rgb}{0.875,0.75,1}" to "mptextmp.mp"; write "\definecolor{LightPurple}{rgb}{0.54,0.332,0.84}" to "mptextmp.mp";%0.75,0.5,1 write "\definecolor{DarkPurple}{rgb}{0.492,0.305,0.77}" to "mptextmp.mp"; write "\definecolor{DdarkPurple}{rgb}{0.348,0.277,0.691}" to "mptextmp.mp"; -- 2.20.1