scratch3 (20mar20)

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

4 files changed, 12 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/scratch3/README b/Master/texmf-dist/doc/latex/scratch3/README
index a4ed01f20d4..c9829a9dfb8 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.15
+              v0.16
 
-           5 mars 2020
+           20 mars 2020
 ___________________________________
 
 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 ade051b2d0c..1eb21d8b58f 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 d9606cce499..da7c723eb75 100644
--- a/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.tex
+++ b/Master/texmf-dist/doc/latex/scratch3/scratch3-fr.tex
@@ -621,4 +621,7 @@ Toute remarque, remontée de bug ---~je n'ose pas dire amélioration du code~---,
 \begin{version}{0.15}{05/03/2020}
 	>Bug corrigé dans les blocs normaux: l'échelle est désormais réinitialisée si besoin.
 \end{version}
+\begin{version}{0.16}{20/03/2020}
+	>Le bug corrigé dans la v0.15 est fautif, \verb|scr_scale| est désormais initialisée dans \verb|\initmoreblocks|.
+\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 f018bb97252..26b771cc273 100644
--- a/Master/texmf-dist/tex/latex/scratch3/scratch3.sty
+++ b/Master/texmf-dist/tex/latex/scratch3/scratch3.sty
@@ -5,9 +5,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                    %
 \def\scrname{                   scratch3                            }%
-\def\scrver {                     0.15                              }%
+\def\scrver {                     0.16                              }%
 %                                                                    %
-\def\scrdate{                  2020/03/05                           }%
+\def\scrdate{                  2020/03/20                           }%
 %                                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -130,7 +130,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \def\scr_normalblock#1#2{% #1=couleur #2=texte
 	\def\scr_current_blockcolor{#1}%
-	\if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi% bugfix 0.15
+%	\if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi% bugfix 0.15 (regression) --> bugfix 0.16
 	\def\scr_currentstuff{%
 		\if_pen
 			\scr_drawpen
@@ -358,6 +358,7 @@
 	\def\scr_currentstuff{%
 		\useKV[\scrname]{pre text}%
 		\_inpicturetrue
+		\def\scr_scale{1}% Bugfix 0.16
 		#1%
 		\scr_blockstrut
 	}%
@@ -1236,3 +1237,6 @@ Versions :
 |   0.15  | 05/03/2020 | * l'échelle n'était pas initialisée dans les blocs   |
 |         |            |   normaux                                            |
 |---------+------------+------------------------------------------------------|
+|   0.16  | 20/03/2020 | * regression 0.15 --> l'échelle est désormais        |
+|         |            |   initialisée dans \initmoreblocks                   |
+|---------+------------+------------------------------------------------------|
\ No newline at end of file