From 180098c3636d91bf83d8030e58c50a33d3db2ddb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Mar 2019 22:22:30 +0000 Subject: scratch3 (9mar19) git-svn-id: svn://tug.org/texlive/trunk@50304 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/scratch3/scratch3.sty | 29 +++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/scratch3') diff --git a/Master/texmf-dist/tex/latex/scratch3/scratch3.sty b/Master/texmf-dist/tex/latex/scratch3/scratch3.sty index 6dc76e66794..09ae438498b 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.1 }% +\def\scrver { 0.11 }% % % -\def\scrdate{ 2019/02/19 }% +\def\scrdate{ 2019/03/10 }% % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -25,7 +25,7 @@ % 3) scratch3-fr.pdf % 4) README % -------------------------------------------------------------------- -\csname @ifpackageloaded\endcsname{scratch} +\@ifpackageloaded{scratch} {\PackageError{scratch3}{scratch3 cannot be used since scratch is already loaded}{}% \endinput } @@ -39,7 +39,9 @@ \expandafter\edef\csname scr\string _restorecatcode\endcsname{\catcode`\noexpand\_=\the\catcode`\_\relax} \catcode`\_11 \def\scr_removespaces#1{\edef#1{\skv_exparg\skv_removeextremespaces#1}} -\scr_removespaces\scrname\scr_removespaces\scrver\scr_removespaces\scrdate +\scr_removespaces\scrname +\scr_removespaces\scrver +\scr_removespaces\scrdate % Les réglages par défaut (modifiables avec \setdefaultscratch) \setKVdefault[\scrname]{ pre text = \sffamily ,% choix de la police @@ -363,6 +365,7 @@ % dessine un bloc de répétition ou test % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\scr_blockloop#1#2#3#4#5{% #1=texte #2=instructions sup #3=instructions inf #4=boucle infinie (1 ou 0) #5=fleche de répétition (1 ou 0) + \def\scr_current_blockcolor{scrcontrol}% BUGFIX 0.11 \edef\scr_blocminheight{\dimexpr\scr_loopblockheight+\scr_ysepinf+\scr_ysepsup+\scr_corner\relax}% hauteur minimale d'un bloc normal \setbox\scr_box\hbox{% \pgfinterruptpicture @@ -513,7 +516,8 @@ \def\scr_ovalbox#1#2#3{% #1=selection (1) ou pas (0) #2=couleur remplissage et contour #3=texte \begingroup \ifnum\lastkern=\scr_ovalsentinel - \unkern\kern-.66667ex\relax + \unkern + \kern-.66667ex\relax \fi \scr_setcolors \def\scr_current_blockcolor{#2}% @@ -609,7 +613,8 @@ outer sep=0pt, minimum size=0pt, baseline=(x.base), - line width=\scr_linewidth + line width=\scr_linewidth, + rounded corners=0pt% BUGFIX 0.11 ] \setbox\scr_box\hbox{% \pgfinterruptpicture @@ -696,7 +701,7 @@ \definecolor{penvline} {HTML}{0da57a}% \newenvironment{scratch}[1][] {\skv_ifempty{#1}{}{\setscratch{#1}}% - \sffamily% pas de \normalsize ici, bugfix 1.4 + \sffamily \edef\scr_ex{\the\dimexpr1ex\relax}% valeur d'1ex pour le tracé de la flèche \edef\scr_em{\the\dimexpr1em\relax}% \scr_normalizedim\scr_corner corner[\scr_ex/3,\scr_ex]% @@ -747,8 +752,8 @@ line cap=round, scale=\scr_scale ] - \node[shape=coordinate](origin){};% origine - }% + \node[shape=coordinate](origin){};% origine + }% {% \end{tikzpicture}% \scr_scratchend @@ -983,7 +988,7 @@ }% }% \def\scr_blockmoreblocks{\scr_normalblock{scrmoreblocks}} -\newcommand*\boolmoreblocks{\scr_boolbox{scrmoreblocksaux}} +\newcommand*\boolmoreblocks{\scr_boolbox{scrmoreblocks}}% BUGFIX 0.11 \scr_restorecatcode \endinput @@ -993,3 +998,7 @@ Versions : |---------+------------+------------------------------------------------------| | 0.1 | 19/02/2019 | Première version | |---------+------------+------------------------------------------------------| +| 0.11 | 10/03/2019 | * \scr_current_blockcolor est désormais défini dans | +| | | \scr_blockloop | +| | | * \boolmoreblocks n'est plus bugguée | +|---------+------------+------------------------------------------------------| -- cgit v1.2.3