scratch3 (18may19)

git-svn-id: svn://tug.org/texlive/trunk@51158 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 20 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/scratch3/README b/Master/texmf-dist/doc/latex/scratch3/README
index 39ff84f0771..a9f62dc8c7a 100644
--- a/Master/texmf-dist/doc/latex/scratch3/README
+++ b/Master/texmf-dist/doc/latex/scratch3/README
@@ -3,9 +3,9 @@ ___________________________________
             L'extension
              scratch3
 
-              v0.11
+              v0.12
 
-           10 mars 2019
+            18 mai 2019
 ___________________________________
 
 Author    : Christian Tellechea
diff --git a/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.pdf b/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.pdf
index d5cdfbdccf2..6c3de0a503e 100644
--- a/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.pdf
+++ b/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.pdf
diff --git a/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.tex b/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.tex
index 4674c0c59df..7facf9d7356 100644
--- a/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.tex
+++ b/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.tex
@@ -591,4 +591,8 @@ Toute remarque, remontée de bug ---~je n'ose pas dire amélioration du code~---,
 	>Correction d'un bug dans \verb|\scr_blockloop| : la couleur \verb|\scr_current_blockcolor| y est désormais définie;
 	>Correction d'un bug dans \verb|\boolmoreblocks| : la couleur est correcte et \verb|rounded corners| désormais est nul pour le tracé d'un losange.
 \end{version}
+\begin{version}{0.12}{18/05/2019}
+	>Correction d'un bug dans \verb|\ovalnum|;
+	>Correction d'un bug dans \verb|\scr_ovalbox|.
+\end{version}
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/scratch3/scratch3.sty b/Master/texmf-dist/tex/latex/scratch3/scratch3.sty
index 09ae438498b..f2b467de7c1 100644
--- a/Master/texmf-dist/tex/latex/scratch3/scratch3.sty
+++ b/Master/texmf-dist/tex/latex/scratch3/scratch3.sty
@@ -4,9 +4,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                    %
 \def\scrname{                   scratch3                            }%
-\def\scrver {                     0.11                              }%
+\def\scrver {                     0.12                              }%
 %                                                                    %
-\def\scrdate{                  2019/03/10                           }%
+\def\scrdate{                  2019/05/18                           }%
 %                                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -521,6 +521,10 @@
 		\fi
 		\scr_setcolors
 		\def\scr_current_blockcolor{#2}%
+		\unless\ifdefined\scr_contrast% bugfix 0.11
+			\scr_normalizedec\scr_contrast contrast[0,100]%
+			\edef\scr_contrast{\number\numexpr100-\scr_contrast}%
+		\fi
 		\begin{tikzpicture}[
 				baseline=(x.base),
 				x=1ex,
@@ -699,6 +703,7 @@
 \definecolor{penline}             {HTML}{595e73}%
 \definecolor{penblue}             {HTML}{4c8eea}%
 \definecolor{penvline}            {HTML}{0da57a}%
+
 \newenvironment{scratch}[1][]
 	{\skv_ifempty{#1}{}{\setscratch{#1}}%
 	\sffamily
@@ -775,7 +780,9 @@
 			\kern-.66667ex\relax
 		\fi
 		\edef\scr_linewidth{\the\dimexpr\useKV[\scrname]{line width}\relax}%
-		\ifdefined\scr_current_blockcolor\else
+		\ifdefined\scr_current_blockcolor% bugfix 0.11
+			\edef\scr_current_blockcolor{\scr_current_blockcolor dd}%
+		\else
 			\def\scr_current_blockcolor{black}%
 		\fi
 		\begin{tikzpicture}[
@@ -789,7 +796,7 @@
 			\node[
 					line width=\scr_linewidth,
 					rounded rectangle,
-					draw={\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor dd}},
+					draw={\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor}},
 					fill=white,
 					text=black
 				]
@@ -1002,3 +1009,6 @@ Versions :
 |         |            |   \scr_blockloop                                     |
 |         |            | * \boolmoreblocks n'est plus bugguée                 |
 |---------+------------+------------------------------------------------------|
+|   0.12  | 18/05/2019 | * bug corrigé dans \ovalnum                          |
+|         |            | * bug corrigé dans \scr_ovalbox                      |
+|---------+------------+------------------------------------------------------|
\ No newline at end of file