From 403bdde66fe01f57d6643b37158be87e73be2d7a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Sep 2017 22:38:00 +0000 Subject: scratch (20sep17) git-svn-id: svn://tug.org/texlive/trunk@45362 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/scratch/README | 6 +-- Master/texmf-dist/doc/latex/scratch/scratch-fr.pdf | Bin 451939 -> 452125 bytes Master/texmf-dist/doc/latex/scratch/scratch-fr.tex | 4 ++ Master/texmf-dist/tex/latex/scratch/scratch.sty | 46 +++++++++------------ 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/Master/texmf-dist/doc/latex/scratch/README b/Master/texmf-dist/doc/latex/scratch/README index c4927254c3c..7ef0b626a68 100644 --- a/Master/texmf-dist/doc/latex/scratch/README +++ b/Master/texmf-dist/doc/latex/scratch/README @@ -3,9 +3,9 @@ ___________________________________ L'extension scratch - v0.31 + v0.32 - 15 septembre 2017 + 20 septembre 2017 ___________________________________ Authors : Christian Tellechea @@ -13,7 +13,7 @@ Maintainer: Christian Tellechea E-mail : unbonpetit@openmailbox.org (CT) Commentaires, signalements de bugs et suggestions bienvenus -Licence : Released under the LaTeX Project Public License v1.3 or +Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt ---------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/scratch/scratch-fr.pdf b/Master/texmf-dist/doc/latex/scratch/scratch-fr.pdf index 1c2821970e3..d3db44e94ae 100644 Binary files a/Master/texmf-dist/doc/latex/scratch/scratch-fr.pdf and b/Master/texmf-dist/doc/latex/scratch/scratch-fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/scratch/scratch-fr.tex b/Master/texmf-dist/doc/latex/scratch/scratch-fr.tex index 0d520aeddd5..7bfa5364e8c 100644 --- a/Master/texmf-dist/doc/latex/scratch/scratch-fr.tex +++ b/Master/texmf-dist/doc/latex/scratch/scratch-fr.tex @@ -506,4 +506,8 @@ Toute remarque, remont >Correction d'un bug signalé par G. \textsc{Mandallaz} dans \verb|\scr_ovalbox| qui s'exécute maintenant dans un groupe : l'assignation de \verb|\scr_current_fillcolor| est donc locale. >Correction d'une erreur dans le tracé des lignes de contraste des \verb|\scr_ovalbox|. \end{version} + +\begin{version}{0.32}{20/09/2017} + >Correction de 2 bugs signalés par G. \textsc{Mandallaz} : la couleur des \verb|\ovallist| n'était pas correcte et la forme des \verb|\selectmenu| n'était pas rectangulaire lorsqu'ils étaient appelés dans un boite ovale. +\end{version} \end{document} \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/scratch/scratch.sty b/Master/texmf-dist/tex/latex/scratch/scratch.sty index 18e21b8e0c1..ead25bbc802 100644 --- a/Master/texmf-dist/tex/latex/scratch/scratch.sty +++ b/Master/texmf-dist/tex/latex/scratch/scratch.sty @@ -4,38 +4,27 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \def\scrname {scratch} % -\def\scrver {0.31} % +\def\scrver {0.32} % % % -\def\scrdate {2017/09/15} % +\def\scrdate {2017/09/20} % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -------------------------------------------------------------------- -% 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 any later version. -% The latest version of this license is in -% -% 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. -% -------------------------------------------------------------------- -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Christian Tellechea -% email: unbonpetit@netc.fr -% Commentaires, suggestions et signalement de bugs bienvenus ! -% Comments, bug reports and suggestions are welcome. +% Author : Christian Tellechea +% Status : Maintained +% Maintainer : Christian Tellechea +% Email : unbonpetit@netc.fr % 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 : -% - code : scratch.sty -% - manuel en français : scratch-fr (.tex et .pdf) -% - fichier lisezmoi : README +% Repository : https://framagit.org/unbonpetit/scratch/tree/master +% Copyright : Christian Tellechea 2017 +% Licence : Released under the LaTeX Project Public License v1.3c +% or later, see http://www.latex-project.org/lppl.txt +% Files : 1) scratch.sty +% 2) scratch-fr.tex +% 3) scratch-fr.pdf +% 4) README % -------------------------------------------------------------------- \ProvidesPackage{scratch}[\scrdate\space v\scrver\space Draw scratch instructions (CT)] \NeedsTeXFormat{LaTeX2e} @@ -354,7 +343,7 @@ \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}}% - \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}; + \node[rectangle,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_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}% @@ -486,7 +475,7 @@ \def\scr_blockvariable{\scr_normalblock{scrvariable}} \def\scr_blocklist{\scr_normalblock{scrlist}} \def\ovalvariable{\scr_ovalbox{scrvariable}} -\def\ovallist{\scr_ovalbox{scrvariable}} +\def\ovallist{\scr_ovalbox{scrlist}} \def\boollist{\scr_boolbox{scrlist}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -563,4 +552,7 @@ Versions : | | | \scr_current_fillcolor | | | | - Correction d'un bug dans le tracé des lignes de | | | | relief dans \scr_ovalbox | +|---------+------------+------------------------------------------------------| +| 0.32 | 20/09/2017 | - le node de \selectmenu est désormais "rectangle" | +| | | - la couleur de \ovallist est désormais correcte | |---------+------------+------------------------------------------------------| \ No newline at end of file -- cgit v1.2.3