diff options
author | Karl Berry <karl@freefriends.org> | 2020-01-24 21:42:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-01-24 21:42:09 +0000 |
commit | d5adeaeb325c83b945dd89cac45b12a7410fd32d (patch) | |
tree | 5c8d765869ef8d8b5341843be54425b273a7e36b /Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex | |
parent | d5e02a3c654b675d1b86fc22a822fa03d884d1e2 (diff) |
tkz-base (24jan20)
git-svn-id: svn://tug.org/texlive/trunk@53530 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex | 122 |
1 files changed, 52 insertions, 70 deletions
diff --git a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex index d4efff422ab..3eec108b22c 100644 --- a/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex +++ b/Master/texmf-dist/tex/latex/tkz-base/tkz-obj-marks.tex @@ -1,27 +1,24 @@ +%tkz-obj-marks.tex % Copyright 2011 by Alain Matthes % % This file may be distributed and/or modified % % 1. under the LaTeX Project Public License and/or % 2. under the GNU Public License. - - -\def\fileversion{1.16 d} -\def\filedate{2018/09/19} - - +\def\fileversion{3.01c} +\def\filedate{2020/01/23} +\typeout{2020/01/23 3.01c tkz-obj-marks.tex} +\makeatletter %<-------------------------------------------------------------------------–> % Setup Marks %<-------------------------------------------------------------------------–> %<--------------------------------------------------------------------------–> % DefSetOfPoints %<--------------------------------------------------------------------------–> -\newif\iftkz@sop@show -\newcount\tkz@cntmk -\pgfkeys{ - /tkzSoPt/.cd, - prefix/.code = {\global\edef\tkz@pref{#1}}, - /tkzSoPt/.unknown/.code = {\let\searchname=\pgfkeyscurrentname +\pgfkeys{/tkzSoPt/.cd, + prefix/.store in = \tkz@pref, + prefix = tkzPt, + /tkzSoPt/.unknown/.code = {\let\searchname=\pgfkeyscurrentname \pgfkeysalso{\searchname/.try=#1, /tikz/\searchname/.retry=#1}} } @@ -29,9 +26,6 @@ \tkz@SetOfPoints[]}} \def\tkz@SetOfPoints[#1]#2{% \begingroup -\pgfkeys{% -/tkzSoPt/.cd, -prefix=tkzPt} \pgfqkeys{/tkzSoPt}{#1} \tkz@cntmk1 % \edef\tkz@@cnt{\the\tkz@cntmk} @@ -39,53 +33,45 @@ prefix=tkzPt} \tkz@cntmk=\tkz@@cnt % \tkzDefPoint(\x,\y){\tkz@pref\the\tkz@cntmk} \advance\tkz@cntmk by1 % - \global\edef\tkz@@cnt{\the\tkz@cntmk} + \xdef\tkz@@cnt{\the\tkz@cntmk} }% -\endgroup}% +\endgroup +}% %<-------------------------------------------------------------------------–> -\pgfkeys{ - /tkzjoinmk/.cd, - prefix/.code = {\global\edef\tkz@pref{#1}}, - /tkzjoinmk/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}} +\pgfkeys{/tkzjoinmk/.cd, + prefix/.store in = \tkz@pref, + prefix=tkzPt, + /tkzjoinmk/.search also={/tikz} } \def\tkzJoinSetOfPoints{\pgfutil@ifnextchar[{\tkz@JoinSetOfPoints}{% \tkz@JoinSetOfPoints[]}} \def\tkz@JoinSetOfPoints[#1]{% \begingroup -\pgfkeys{% -/tkzjoinmk/.cd, -prefix=tkzPt} -\pgfqkeys{/tkzjoinmk}{#1} -\pgfmathsetcount{\tkz@cntmk}{\tkz@@cnt-2} -\edef\tkz@@cnt{\the\tkz@cntmk} -\foreach \nb in {1,...,\tkz@@cnt}{% -\tkz@cntmk=\nb -\advance\tkz@cntmk by1 -\draw[line cap=round,/tkzjoinmk/.cd,#1] (\tkz@pref\nb)--(\tkz@pref\the\tkz@cntmk);} + \pgfqkeys{/tkzjoinmk}{#1} + \pgfmathsetcount{\tkz@cntmk}{\tkz@@cnt-2} + \edef\tkz@@cnt{\the\tkz@cntmk} + \foreach \nb in {1,...,\tkz@@cnt}{% + \tkz@cntmk=\nb + \advance\tkz@cntmk by1 + \draw[line cap=round,/tkzjoinmk/.cd,#1] + (\tkz@pref\nb) -- (\tkz@pref\the\tkz@cntmk);} \endgroup} %<-------------------------------------------------------------------------–> % ShowSetOfMark %<-------------------------------------------------------------------------–> -\pgfkeys{ -/tkzdrawmk/.cd, -prefix/.code = {\global\edef\tkz@pref{#1}}, -/tkzdrawmk/.unknown/.code = {\let\searchname=\pgfkeyscurrentname - \pgfkeysalso{\searchname/.try=#1, - /tikz/\searchname/.retry=#1}} +\pgfkeys{/tkzdrawmk/.cd, + prefix/.store in = \tkz@pref, + prefix=tkzPt, + /tkzdrawmk/.search also = {/tikz} } \def\tkzDrawSetOfPoints{\pgfutil@ifnextchar[{\tkz@DrawSetOfPoints}{ \tkz@DrawSetOfPoints[]}} \def\tkz@DrawSetOfPoints[#1]{% \begingroup -\pgfkeys{/tkzdrawmk/.cd, prefix=tkzPt} \pgfqkeys{/tkzdrawmk}{#1} \pgfmathsetcount{\tkz@cntmk}{\tkz@@cnt-1} -\foreach \nb in {1,...,\tkz@cntmk}{% -\tkzDrawMark[#1](\tkz@pref\nb)} +\foreach \nb in {1,...,\tkz@cntmk}{\tkzDrawMark[#1](\tkz@pref\nb)} \endgroup} - %<-------------------------------------------------------------------------–> % tkzmark %<-------------------------------------------------------------------------–> @@ -93,43 +79,39 @@ prefix/.code = {\global\edef\tkz@pref{#1}}, \def\tkz@DrawMark[#1](#2){% \draw plot[mark style,#1] coordinates {(#2)}; } -%<-------------------------------------------------------------------------–> -%<--------------------------------------------------------------------------–> +%<---------------------------------------------------------–> +%<---------------------------------------------------------–> \def\tkzDrawMarks{\pgfutil@ifnextchar[{\tkz@DrawMarks}{\tkz@DrawMarks[]}} \def\tkz@DrawMarks[#1](#2){% -\foreach \point in {#2}{% -\draw plot[mark style,#1] coordinates {(\point)}; % StyleMark, + \foreach \point in {#2}{% + \draw plot[mark style,#1] coordinates {(\point)};% StyleMark, }} - -%<--------------------------------------------------------------------------–> +%<------------------------------------------------------------–> % Init pour mark -%<--------------------------------------------------------------------------–> -\pgfkeys{% -setupmk/.cd, -size/.code = {\global\edef\tkz@sum@mk@size{#1}}, -color/.code = {\global\edef\tkz@sum@mk@color{#1}}, -fill/.code = {\global\edef\tkz@sum@mk@fill{#1}}, -mark/.code = {\global\edef\tkz@sum@mk@mark{#1}} +%<------------------------------------------------------------–> +\pgfkeys{/setupmk/.cd, + size/.store in = \tkz@sum@mk@size, + color/.store in = \tkz@sum@mk@color, + fill/.store in = \tkz@sum@mk@fill, + mark/.store in = \tkz@sum@mk@mark, + mark = \tkz@mk@mark, + color = \tkz@mk@color, + fill = \tkz@mk@color!50, + size = \tkz@mk@size } - \def\tkzSetUpMark{\pgfutil@ifnextchar[{\tkzActivOff\tkz@SetUpMark}{% \tkzActivOff\tkz@SetUpMark[]}} \def\tkz@SetUpMark[#1]{% - \pgfkeys{% -/setupmk/.cd, -mark = \tkz@mk@mark, -color = \tkz@mk@color, -fill = \tkz@mk@color!50, -size = \tkz@mk@size} \pgfqkeys{/setupmk}{#1} -\tikzset{mark style/.style={inner sep = 0pt, - mark = \tkz@sum@mk@mark, - mark size = \tkz@sum@mk@size, - mark options = {color = \tkz@sum@mk@color, - fill = \tkz@sum@mk@fill}}} +\tikzset{mark style/.style={% + inner sep = 0pt, + mark = \tkz@sum@mk@mark, + mark size = \tkz@sum@mk@size, + mark options = {color = \tkz@sum@mk@color, + fill = \tkz@sum@mk@fill}}} }% - -%<--------------------------------------------------------------------------–> +\makeatother +%<--------------------------------------- ------------------–> \endinput
\ No newline at end of file |