scratch (15sep17)

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

1 files changed, 32 insertions, 21 deletions

diff --git a/Master/texmf-dist/tex/latex/scratch/scratch.sty b/Master/texmf-dist/tex/latex/scratch/scratch.sty
index ae4fa5cb6af..18e21b8e0c1 100644
--- a/Master/texmf-dist/tex/latex/scratch/scratch.sty
+++ b/Master/texmf-dist/tex/latex/scratch/scratch.sty
@@ -4,19 +4,19 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                    %
 \def\scrname                   {scratch}                             %
-\def\scrver                      {0.3}                               %
+\def\scrver                      {0.31}                              %
 %                                                                    %
-\def\scrdate                  {2017/08/08}                           %
+\def\scrdate                  {2017/09/15}                           %
 %                                                                    %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % --------------------------------------------------------------------
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
+% of this license or any later version.
 % The latest version of this license is in
 %
-% %     http://www.latex-project.org/lppl.txt
+%     http://www.latex-project.org/lppl.txt
 %
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
@@ -28,6 +28,8 @@
 %        Commentaires, suggestions et signalement de bugs bienvenus !
 %        Comments, bug reports and suggestions are welcome.
 % Package URL: https://www.ctan.org/pkg/scratch
+% Bug tracker: https://framagit.org/unbonpetit/scratch/issues
+% Repository:  https://framagit.org/unbonpetit/scratch/tree/master
 % Copyright: Christian Tellechea 2017
 % --------------------------------------------------------------------
 % L'extension scratch est composée des 4 fichiers suivants :
@@ -323,17 +325,19 @@
 %                           dessine un ovale                           %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \def\scr_ovalbox#1#2{% #1=couleur remplissage et contour  #2=texte
-	\edef\scr_linewidth{\the\dimexpr\useKV[\scrname]{line width}\relax}%
-	\def\scr_current_blockcolor{#1}%
-	\edef\scr_current_fillcolor{\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}}%
-	\edef\scr_current_linelight{\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor}!\the\numexpr100-\useKV[\scrname]{contrast}\relax!white}%
-	\edef\scr_current_linedark {\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor}!\the\numexpr100-\useKV[\scrname]{contrast}\relax!black}%
-	\edef\scr_current_textcolor{\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}%
-	\begin{tikzpicture}[baseline=(x.base),x=1ex,y=1ex,inner ysep=0.25ex,inner xsep=0.1ex,line width=\scr_linewidth]
-		\node[rounded rectangle,draw=none,fill=\scr_current_fillcolor,text=\scr_current_textcolor](x){\sffamily\bfseries\relax#2\scr_ovalstrut};%
-		\draw[draw=\scr_current_linedark](x.west)to[out=270,in=180](x.south west)--(x.south east)to[out=0,in=270](x.east);
-		\draw[draw=\scr_current_linelight](x.west)to[out=90,in=180](x.north west)--(x.north east)to[out=0,in=90](x.east);
-	\end{tikzpicture}%
+	\begingroup
+		\edef\scr_linewidth{\the\dimexpr\useKV[\scrname]{line width}\relax}%
+		\def\scr_current_blockcolor{#1}%
+		\edef\scr_current_fillcolor{\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}}%
+		\edef\scr_current_linelight{\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor}!\the\numexpr100-\useKV[\scrname]{contrast}\relax!white}%
+		\edef\scr_current_linedark {\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor}!\the\numexpr100-\useKV[\scrname]{contrast}\relax!black}%
+		\edef\scr_current_textcolor{\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}%
+		\begin{tikzpicture}[baseline=(x.base),x=1ex,y=1ex,inner ysep=0.25ex,inner xsep=0.1ex,line width=\scr_linewidth]
+			\node[rounded rectangle,draw=none,fill=\scr_current_fillcolor,text=\scr_current_textcolor](x){\sffamily\bfseries\relax#2\scr_ovalstrut};%
+			\draw[draw=\scr_current_linedark](x.west)to[out=270,in=180](x.south west)--(x.south east)to[out=0,in=270](x.east);
+			\draw[draw=\scr_current_linelight](x.west)to[out=90,in=180](x.north west)--(x.north east)to[out=0,in=90](x.east);
+		\end{tikzpicture}%
+	\endgroup
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                   dessine un triangle de sélection                   %
@@ -351,8 +355,8 @@
 		\edef\scr_current_linedark {\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor}!\the\numexpr100-\useKV[\scrname]{contrast}\relax!black}%
 		\edef\scr_current_textcolor{\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}%
 		\node[draw=none,inner xsep=0.2em,fill=\scr_current_fillcolor,text=\scr_current_textcolor](textmenu){\normalfont\sffamily#1\scr_ovalstrut\hskip.6666em \scr_menuselectarrow};
-		\draw[draw=\scr_current_linelight,line width=\scr_linewidth](textmenu.south west)--(textmenu.north west)--(textmenu.north east);
-		\draw[draw=\scr_current_linedark,line width=\scr_linewidth](textmenu.south west)--(textmenu.south east)--(textmenu.north east);
+		\draw[draw=\scr_current_linedark,line width=\scr_linewidth](textmenu.south west)--(textmenu.north west)--(textmenu.north east);
+		\draw[draw=\scr_current_linelight,line width=\scr_linewidth](textmenu.south west)--(textmenu.south east)--(textmenu.north east);
 	\end{tikzpicture}%
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -540,16 +544,23 @@
 Versions :
  _____________________________________________________________________________
 | Version |    Date    | Changements                                          |
-|-----------------------------------------------------------------------------|
+|---------+------------+------------------------------------------------------|
 |   0.1   | 16/05/2017 | Première version                                     |
-|-----------------------------------------------------------------------------|
+|---------+------------+------------------------------------------------------|
 |   0.2   | 28/05/2017 | Ajout des options "constast", "print" ainsi que      |
 |         |            | les options relatives à "print"                      |
-|-----------------------------------------------------------------------------|
+|---------+------------+------------------------------------------------------|
 |   0.3   | 08/08/2017 | - Correction d'une erreur dans le tracé des lignes   |
 |         |            |   de contraste des "boolbox"                         |
 |         |            | - Correction d'un bug dans \resetscratch             |
 |         |            | - Correction d'un bug dans \txtbox                   |
 |         |            | - Appel à simplekv pour les clés/valeurs             |
 |         |            | - Ajout de la clé "scale"                            |
-|-----------------------------------------------------------------------------|
\ No newline at end of file
+|---------+------------+------------------------------------------------------|
+|   0.31  | 15/09/2017 | - Correction d'un bug dans \scr_ovalbox qui          |
+|         |            |   s'exécute maintenant dans un groupe semi-simple    |
+|         |            |   pour rendre locale l'assignation à                 |
+|         |            |   \scr_current_fillcolor                             |
+|         |            | - Correction d'un bug dans le tracé des lignes de    |
+|         |            |   relief dans \scr_ovalbox                           |
+|---------+------------+------------------------------------------------------|
\ No newline at end of file