diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/tkz-doc/README | 24 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tkz-doc/README.md | 46 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tkz-doc/latex/couverture.tex (renamed from Master/texmf-dist/doc/latex/tkz-doc/couverture.tex) | 39 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tkz-doc/latex/tkz-doc.cfg (renamed from Master/texmf-dist/doc/latex/tkz-doc/tkz-doc.cfg) | 16 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tkz-doc/latex/tkz-doc.cls (renamed from Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls) | 94 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tkz-doc/latex/tkzexample.sty (renamed from Master/texmf-dist/tex/latex/tkz-doc/tkzexample.sty) | 158 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 5 |
7 files changed, 195 insertions, 187 deletions
diff --git a/Master/texmf-dist/doc/latex/tkz-doc/README b/Master/texmf-dist/doc/latex/tkz-doc/README deleted file mode 100644 index 1df3d863fb9..00000000000 --- a/Master/texmf-dist/doc/latex/tkz-doc/README +++ /dev/null @@ -1,24 +0,0 @@ -Class and package for the documentation of all tkz-* packages. - %%% H I G H L Y E X P E R I M E N T A L %%% -readme-tkz-doc.txt V1.3c 2020/03/08 - -Licence -------- -% Copyright 2020 Alain Matthes -% 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. -% 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 Alain Matthes. - - Alain Matthes - 5 rue de Valence - Paris 75005 - - al (dot) ma (at) mac (dot) com
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tkz-doc/README.md b/Master/texmf-dist/doc/latex/tkz-doc/README.md new file mode 100644 index 00000000000..bd4e76b0d72 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tkz-doc/README.md @@ -0,0 +1,46 @@ +# tkz-doc — Class and package for the documentation of all tkz-* packages. + +Release 1.43c 2020/04/10 + +## Note + +This package is highly experimental and subject to change without notice. + +## Licence + +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. +The latest version of this license is in +[LaTeX Project Public License](https://www.latex-project.org/lppl/) +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 Alain Matthes. + +## Installation + +The package `tkz-doc` is present in `TeXLive` and `MiKTeX`, use the +package manager to install. + +For manual installation all files must be moved into the different directories in your +installation `TDS` tree or in your `TEXMFHOME`: + +``` + doc/README.md -> TDS:doc/latex/tkz-doc/README.md + latex/*.* -> TDS:tex/latex/tkz-doc/*.* +``` + +## How to use it + +1. If you want to compile the documentation of a `tkz-*` package, you need to use the lualatex engine. + +## History + +- v 1.43 Correction of bug about the color. Remove the library `babel` of `TikZ` +- v 1.42 I added in the version 1.4, an option called `cadre`. If you want to draw the frame of the cover, you need to use this option. In this case, you need to +install the font `orna4`. By default, no frame. + +## Author + +Alain Matthes, 5 rue de Valence, Paris 75005, al (dot) ma (at) mac (dot) com diff --git a/Master/texmf-dist/doc/latex/tkz-doc/couverture.tex b/Master/texmf-dist/doc/latex/tkz-doc/latex/couverture.tex index 22d8728b94c..88df6f1036c 100644 --- a/Master/texmf-dist/doc/latex/tkz-doc/couverture.tex +++ b/Master/texmf-dist/doc/latex/tkz-doc/latex/couverture.tex @@ -1,4 +1,4 @@ -% encoding: utf8 +% encoding: utf8 % Copyright 2020 Alain Matthes % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -9,11 +9,13 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status “maintained”. -% +% % The Current Maintainer of this work is Alain Matthes. %<--------- Couverture des documentations -------------------------------- - +\def\fileversion{1.43c} +\def\filedate{2020/04/10} +\typeout{2020/04/10 1.43c couverture.tex} %<------------------ Make Title ------------------------------------------ \renewcommand\maketitle{% @@ -43,25 +45,25 @@ \begin{pgfpicture} \pgfsys@transformxyscale{.5}{.5} \pgfmathdeclarerandomlist{color}{{myblue}{DarkBlue}{SteelBlue}{blue}{MidnightBlue}} - \foreach \a in {1,...,5}{% - \pgfmathrandominteger{\x}{1}{300}% - \pgfmathrandominteger{\y}{1}{200}% - \pgfmathrandominteger{\r}{20}{100}% - \pgfmathrandominteger{\s}{5}{95}% + \foreach \a in {1,...,5}{% + \pgfmathrandominteger{\x}{1}{300}% + \pgfmathrandominteger{\y}{1}{200}% + \pgfmathrandominteger{\r}{20}{100}% + \pgfmathrandominteger{\s}{5}{95}% \pgfmathrandominteger{\o}{50}{80}% - \pgfmathrandomitem{\c}{color}% + \pgfmathrandomitem{\c}{color}% \pgfdeclareradialshading{ballshading}{% - \pgfpoint{-10bp}{10bp}}% + \pgfpoint{-10bp}{10bp}}% {% - color(0bp)=(\c!15!white); - color(9bp)=(\c!75!white); - color(18bp)=(\c!70!black); - color(25bp)=(\c!50!black); + color(0bp)=(\c!15!white); + color(9bp)=(\c!75!white); + color(18bp)=(\c!70!black); + color(25bp)=(\c!50!black); color(50bp)=(black)% }% - \pgfsetfillopacity{\o/100}% - \pgfpathcircle{\pgfpoint{+\x pt}{+\y pt}}{+\r pt} - \pgfshadepath{ballshading}{\s}% + \pgfsetfillopacity{\o/100}% + \pgfpathcircle{\pgfpoint{+\x pt}{+\y pt}}{+\r pt} + \pgfshadepath{ballshading}{\s}% \pgfusepath{}% }% \end{pgfpicture}} @@ -79,7 +81,7 @@ \fontsize{17}{21} \textcolor{sectioncolor}{\selectfont{\tkzauthorofpack}}% }% - }% + }% \put(120,20){% \makebox(0,0)[l]{% \textcolor{sectioncolor}{\url{\tkzurlauthorcom}}% @@ -93,3 +95,4 @@ \setcounter{footnote}{0}% }% %<----------------------- End Couverture ----------------------------> +\endinput diff --git a/Master/texmf-dist/doc/latex/tkz-doc/tkz-doc.cfg b/Master/texmf-dist/doc/latex/tkz-doc/latex/tkz-doc.cfg index e360a4231bf..2f3e98a2ab2 100644 --- a/Master/texmf-dist/doc/latex/tkz-doc/tkz-doc.cfg +++ b/Master/texmf-dist/doc/latex/tkz-doc/latex/tkz-doc.cfg @@ -1,5 +1,3 @@ -% Copyright 2011 by Alain Matthes -% encoding: utf8 % Copyright 2020 Alain Matthes % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -21,14 +19,15 @@ % variable. %=============================================================================== -\def\fileversion{1.3c} -\def\filedate{2020/03/03} +\def\fileversion{1.43c} +\def\filedate{22020/04/10} +\typeout{2020/04/10 1.43c tkz-doc.cfg} % ============= colors ========================================================= % \definecolor [⟨type⟩]{⟨name⟩}{⟨model-list⟩}{⟨spec-list⟩} -% \providecolor [⟨type⟩]{⟨name⟩}{⟨model-list⟩}{⟨spec-list⟩} -% \colorlet [⟨type⟩]{⟨name⟩}[⟨num model⟩]{⟨color⟩} +% \providecolor [⟨type⟩]{⟨name⟩}{⟨model-list⟩}{⟨spec-list⟩} +% \colorlet [⟨type⟩]{⟨name⟩}[⟨num model⟩]{⟨color⟩} \definecolor{myblue}{RGB}{020,120,180} \definecolor{fondpaille}{cmyk}{0,0,0.1,0} \definecolor{bistre}{rgb}{.75,.50,.30} @@ -49,7 +48,7 @@ \colorlet{codeonlybackground}{lightgray!30} \colorlet{numbackground}{white} \colorlet{textcodecolor}{darkgray} -\colorlet{numcolor}{MidnightBlue} +\colorlet{numcolor}{black} \definecolor{Salmon}{RGB}{178,51,51} \definecolor{BrickRed}{RGB}{233,49,16} @@ -73,7 +72,7 @@ \newcommand*{\tkzHand}{\ \\\llap{\textcolor{red}{\lefthand\hskip1em}}} \newcommand*{\tkzBomb}{\ \\\llap{\textcolor{red}{\bomb\hskip1em}}} \newcommand*{\tkzTwoBomb}{\ \\\llap{\textcolor{red}{\bomb\ \bomb\hskip1em}}} -\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{MidnightBlue}{#1}}}} +\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{black}{#1}}}} \newcommand*{\tkzimp}[1]{\textbf{#1}} \newcommand*{\tkzHandBomb}{\ \\\llap{\textcolor{red}{\lefthand\ \bomb\hskip1em}}} \providecommand\LaTeX{L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX} @@ -87,4 +86,3 @@ \global\edef\tkz@suc@txt{\tkz@text@color} %------------------------------------------------------------------------------- \endinput - diff --git a/Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls b/Master/texmf-dist/doc/latex/tkz-doc/latex/tkz-doc.cls index 132dde45131..1b74679f6c7 100644 --- a/Master/texmf-dist/tex/latex/tkz-doc/tkz-doc.cls +++ b/Master/texmf-dist/doc/latex/tkz-doc/latex/tkz-doc.cls @@ -1,5 +1,5 @@ % tkz-doc.cls -% encoding: utf8 +% encoding: utf8 % Copyright 2020 Alain Matthes % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -8,25 +8,27 @@ % 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 Alain Matthes. -% -% tkz-doc class for use with the tkz documentation +% tkz-doc class for use with the tkz documentation % ( AlterMundus Collection ). % %% Objet : Classe LaTeX et Styles pour créer des documentations. %<-------------- Définitions relatives au package ---------------------------> \newcommand*{\PackageName}{tkz-doc} -\newcommand*{\PackageVersion}{1.3c} -\newcommand*{\filedate}{2020/03/03} +\newcommand*{\PackageVersion}{1.43c} +\newcommand*{\filedate}{2020/04/10} + +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} + %<---------------------- Identification Part --------------------------------> \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{\PackageName}[% \filedate\space Version:\space\PackageVersion\space % tkz documentation class based on scrartcl] -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} +\newif\if@tkzcadre +\@tkzcadrefalse +\DeclareOption{cadre}{\@tkzcadretrue} \ProcessOptions\relax \LoadClass[titlepage,a4paper]{scrartcl} %<----------------- loading some packages ----------------------------------> @@ -39,16 +41,16 @@ %<-------------------------------------------------------------------------->- \RequirePackage{framed,eso-pic} \RequirePackage[bottom,stable,ragged]{footmisc} -\RequirePackage[automark,markcase=ignoreuppercase]{scrlayer-scrpage} +\RequirePackage[automark,markcase=ignoreuppercase]{scrlayer-scrpage} %<------------- define important words ----------------------------------> \InputIfFileExists{tkz-doc.cfg}{\typeout{Local configuration file tkz-doc.cfg found and used}}{\typeout{tkz-doc.cfg not found}} %<-------------------------------------------------------------------------->- -\pagestyle{scrheadings} +\pagestyle{scrheadings} \clearscrheadings \clearscrplain \ohead{\textcolor{sectioncolor}{\pagemark}} \ihead{\textcolor{sectioncolor}{\headmark}} -\rofoot{\textcolor{sectioncolor}{\tkznamecollection}} +\rofoot{\textcolor{sectioncolor}{\tkznamecollection}} \lofoot{\textcolor{sectioncolor}{\tkznameofpack}} \automark[subsection]{section} @@ -77,46 +79,42 @@ %<--------------------------------------------------------------------------- \newcounter{cnt}\setcounter{cnt}{1} \setcounter{secnumdepth}{3}% -\setcounter{tocdepth}{3} -\color{blue} +\setcounter{tocdepth}{3} %<------------------ Éxécution et chargement ----------------------------- - - \RequirePackage{tikz} -\usetikzlibrary{babel, - decorations.shapes, +\usetikzlibrary{decorations.shapes, decorations.text, decorations.pathreplacing, decorations.pathmorphing, decorations.markings, - shadows} + shadows} \RequirePackage{tabularx,ragged2e} \RequirePackage[bottom,stable,ragged]{footmisc} -\raggedbottom -\newbox\tkzbox +\raggedbottom +\newbox\tkzbox %<--------------- some macros -------------------------------------------- -\def\nodeshadowedone(#1,#2)#3{% -\node[myblue,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox}; +\def\nodeshadowedone(#1,#2)#3{% +\node[myblue,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox}; \node[above,yscale=#2,inner sep=0pt,xslant=#1,myblue!60]{\box\tkzbox}; -}% +}% % some of the macros below are absolete \def\nameoffile#1{\gdef\@nameoffile{#1}} \def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}} \long\def\defoffile#1{\protected@xdef\@defoffile{\@defoffile{#1}}} \let\@defoffile\@empty %<------------------------------------------------------------------------- -\newcommand*{\addbs}[1]{\texttt{\textbackslash#1}} +\newcommand*{\addbs}[1]{\texttt{\textbackslash#1}} \newcommand*{\@CellCode}[1]{} \newcommand*{\thead}{\noalign{\iffalse}\fi\@thead} \newcommand*{\@thead}[1][\em\ttfamily]{\gdef\@CellCode{#1}\iffalse{\fi}} \newcommand*{\tbody}{\noalign{\gdef\@CellCode{}}} -\newcolumntype{I}{>{\@CellCode}} +\newcolumntype{I}{>{\@CellCode}} %<-------------------------- NewMacroBox -----------------------------------> \newcommand*{\ActivBoxName}{} \newenvironment{NewMacroBox}[2]{% \parindent=0pt \renewcommand*{\ActivBoxName}{#1} -\def\FrameCommand{\color{myblue}{\vrule width 1pt\hspace{3pt}}}% +\def\FrameCommand{\color{MidnightBlue}{\vrule width 1pt\hspace{3pt}}}% \MakeFramed{\advance\hsize-\width}% \noindent \makebox[0pt][l]{% @@ -173,7 +171,7 @@ \noindent % \ignorespaces\tkzcname{#1#3} \Ienv{#1} -\color{myblue}}{% +\color{MidnightBlue}}{% \par\noindent% \makebox[0pt][l]{% \hspace{-6pt}% @@ -196,41 +194,41 @@ \providecommand\oarg[1]{{\ttfamily[}\opt{\meta{#1}}{\ttfamily]}} \providecommand\parg[1]{{\ttfamily(}\opt{\meta{#1}}{\ttfamily)}} \newcommand\opt[1]{{\color{myblue}#1}} -\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}} +\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}} \newcommand*{\var}[1]{\{\opt{\meta{#1}}\}} \newcommand*{\varp}[1]{\big(\opt{\meta{#1}}\big)} \newcommand*{\vara}[1]{\{#1\}} % -- Macros pour indexation ------------------------------------------------- \newcommand*{\tkzNamePack}[1]{\NamePack{#1}} \newcommand*{\tkzNameMacro}[1]{\tkzcname{#1}\Imacro{#1}} -\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}} +\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}} \newcommand*{\Ilib}[1]{\index{Library_1@\texttt{Library}!\texttt{#1}}} \newcommand*{\Ienv}[1]{\index{Environment_1@\texttt{Environment}!\texttt{#1}}} \newcommand*{\IargEnv}[2]{\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}} \newcommand*{\IargNameEnv}[2]{\texttt{#2}\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}} -\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}} +\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}} \newcommand*{\IoptNameEnv}[2]{\texttt{#2}\index{#1_3@\texttt{#1: options}!\texttt{#2}}} \newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}%n \newcommand*{\Iarg}[2]{\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}} \newcommand*{\IargName}[2]{\texttt{#2}\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}} \newcommand*{\IoptName}[2]{\texttt{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}} \newcommand*{\Iopt}[2]{\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}} -\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}} -\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}} +\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}} +\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}} \newcommand*{\Iaccent}[2]{\index{#1@\texttt{#2}}} -\newcommand*{\NameLib}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}} +\newcommand*{\NameLib}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}} \newcommand*{\NameSys}[1]{\texttt{#1}\index{Operating System !#1@\texttt{#1}}} \newcommand*{\NameDist}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{TeX Distributions !#1@\texttt{#1}}} -\newcommand*{\NameFonct}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Functions !#1@\texttt{#1}}} -\newcommand*{\NamePack}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Package !#1@\texttt{#1}}} +\newcommand*{\NameFonct}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Functions !#1@\texttt{#1}}} +\newcommand*{\NamePack}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Package !#1@\texttt{#1}}} \newcommand*{\TOenvline}[3]{\IoptNameEnv{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} \newcommand*{\TOline}[3]{\IoptName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} \newcommand*{\TAline}[3]{\IargName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\} \newcommand*{\TMline}[3]{\tkzcname{#1}\index{#1_1@\texttt{\textbackslash#1}}&\tkzdft{#2}&\ttfamily #3\\} \newcommand*{\tkzcname}[1]{\Imacro{#1}\textbf{\texttt{\textcolor{MidnightBlue}{% - \textbackslash#1}}}} + \textbackslash#1}}}} \newcommand*{\tkzhname}[1]{\textbf{\texttt{\textcolor{MidnightBlue}{% - \textbackslash#1}}}} + \textbackslash#1}}}} \DeclareRobustCommand\meta[1]{% \ensuremath\langle @@ -262,25 +260,24 @@ \let\item\@idxitem }{% \if@restonecol\onecolumn\else\clearpage\fi -} +} %<----------- set colors of the document -------------------------- \pgfkeys{/tkzsetupcolor/.cd, background/.code = {\global\edef\tkz@suc@bkc{#1}}, - text/.code = {\global\edef\tkz@suc@txt{#1}}} + text/.code = {\global\edef\tkz@suc@txt{#1}}} \def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{% - \tkz@SetUpColors[]}} + \tkz@SetUpColors[]}} \def\tkz@SetUpColors[#1]{% \begingroup \pgfkeys{tkzsetupcolor/.cd, background = \tkz@background@color, text = \tkz@text@color} - \pgfqkeys{/tkzsetupcolor}{#1} + \pgfqkeys{/tkzsetupcolor}{#1} \pagecolor{\tkz@suc@bkc} \color{\tkz@suc@txt} -\endgroup} +\endgroup} %<--------------------------------------------------------------------- - \input{couverture} %<--------- presentation première page ---------------------------------> \newcommand\presentation{% @@ -288,7 +285,7 @@ \par\vspace*{3 cm} \begin{center} {\textcolor{myblue}{\Huge \@nameoffile}} - \end{center} + \end{center} \par\vspace*{3 cm} \noindent \newlength{\tkz@lx}\settowidth{\tkz@lx}{\huge \tkznamecollection}% @@ -307,13 +304,4 @@ \par \end{minipage} } -%<----------------- end presentation ----------------------------------> - \endinput -%<--------------------------------------------------------------------- - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % - % End of file `tkz-doc.cls'. % - % % - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/tkz-doc/tkzexample.sty b/Master/texmf-dist/doc/latex/tkz-doc/latex/tkzexample.sty index 3d0eb98fe4b..c564a0f0d17 100644 --- a/Master/texmf-dist/tex/latex/tkz-doc/tkzexample.sty +++ b/Master/texmf-dist/doc/latex/tkz-doc/latex/tkzexample.sty @@ -1,6 +1,3 @@ -% H I G H L Y E X P E R I M E N T A L -% -% encoding : utf8 % Documentation of tkz-euclide % Copyright 2020 Alain Matthes % This work may be distributed and/or modified under the @@ -12,23 +9,23 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status “maintained”. -% +% % The Current Maintainer of this work is Alain Matthes. % -% The author of the original code +% The author of the original code % of the environment 'codeexample' is Till Tantau % from the file pgfmanual-en-macros.tex % (Copyright 2006 by Till Tantau) % See the file doc/generic/pgf/licenses/LICENSE for more details. -% +% H I G H L Y E X P E R I M E N T A L %<---------------------------------------------------------------------------> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tkzexample}[2011/06/04 v1.1 c (code and graphic ) ] +\ProvidesPackage{tkzexample}[2020/04/10 v1.43c (code and graphic)] \RequirePackage{calc,mdframed,fancyvrb} -\newif\iftkzcodesaved +\newif\iftkzcodesaved \DeclareOption{saved}{\tkzcodesavedtrue} -\ProcessOptions\relax +\ProcessOptions\relax %<---------------------------------------------------------------------------> \colorlet{graphicbackground}{white} \colorlet{codebackground}{white} @@ -36,7 +33,7 @@ \colorlet{numbackground}{white} \colorlet{textcodecolor}{black} \colorlet{numcolor}{gray} -%<---------------------------------------------------------------------------> +%<---------------------------------------------------------------------------> \def\code@style{\small\ttfamily} \makeatletter \newcounter{code@cnt}% @@ -64,7 +61,7 @@ \catcode `\}=12 \catcode`\\=12 |gdef|find@tkzltxexample#1\end{tkzltxexample}[|endoftkzltxexample[#1]] |endgroup - + % define \returntospace. % % It should define NEWLINE as {}, spaces and tabs as \space. @@ -85,46 +82,46 @@ \gdef\typesetcomment{\catcode`\%=13\def%{\@typeset@till@return}} \gdef\@typeset@till@return#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}}\par} \gdef\typesetcommentnum{\catcode`\%=13\def%{\@typeset@till@return@num}} -\gdef\@typeset@till@return@num#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}} \@@par} +\gdef\@typeset@till@return@num#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}} \@@par} \endgroup -\let\tkz@frameset\colorbox +\let\tkz@frameset\colorbox \let\tkz@frameltxset\colorbox \newwrite\fileexample \newdimen\tkzexamplewidth \newdimen\tkz@hsep \tkz@hsep=0pt -\newif\ifcode@execute +\newif\ifcode@execute \newif\ifcode@saved\code@savedfalse \newif\ifnum@show \num@showfalse \newif\ifcode@overhang \newbox\tkzexamplebox -\newif\ifcode@vbox \code@vboxfalse +\newif\ifcode@vbox \code@vboxfalse \pgfqkeys{/tkzexample}{% execute code/.is if = code@execute, show num/.is if = num@show, overhang/.is if = code@overhang, - code only/.code = {\code@executefalse}, + code only/.code = {\code@executefalse}, width/.code = {\setlength\tkzexamplewidth{#1}}, code/.code = {\colorlet{codebackground}{#1}}, - graphic/.code = {\colorlet{graphicbackground}{#1}}, + graphic/.code = {\colorlet{graphicbackground}{#1}}, overhang/.code = {\code@overhangtrue}, num/.code = {\num@showtrue\setcounter{code@cnt}{1}}, numcolor/.code = {\colorlet{numcolor}{#1}}, numbkgcolor/.code = {\colorlet{numbackground}{#1}}, global num/.code = {\num@showtrue}, code style/.code = {\def\code@style{#1}}, - normal/.code = {\def\code@size{\normalsize}}, + normal/.code = {\def\code@size{\normalsize}}, small/.code = {\def\code@size{\small}}, very small/.code = {\def\code@size{\footnotesize}}, right margin/.code = {\def\tkz@rightmargin{#1}}, - left margin/.code = {\def\tkz@leftmargin{#1}}, + left margin/.code = {\def\tkz@leftmargin{#1}}, inner left margin/.code = {\def\tkz@innerleftmargin{#1}}, inner right margin/.code = {\def\tkz@innerrightmargin{#1}}, inner top margin/.code = {\def\tkz@innertopmargin{#1}}, inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}}, - line frame width/.code = {\def\tkz@linewidth{#1}}, + line frame width/.code = {\def\tkz@linewidth{#1}}, frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}}, frame tex/.code = {\def\tkz@frameltxset{\fcolorbox{#1}}}, above skip/.code = {\def\tkz@above{#1}}, @@ -140,7 +137,7 @@ \vbox\bgroup \setlength{\hsize}{\linewidth-6pt}% }% - \def\code@postadd{\egroup}}, + \def\code@postadd{\egroup}}, every tkzexample/.style={width=6cm}, }% \def\code@size{}% @@ -151,16 +148,16 @@ \def\tkz@above{\par}% \def\tkz@below{\par}% -% execution du code +% execution du code \def\tkz@result{% \begin{minipage}[t]{\wd\tkzexamplebox}% \hrule width0pt \code@size \box\tkzexamplebox - \leavevmode - \end{minipage}% + \leavevmode + \end{minipage}% }% - + \newcommand\tkz@code[1]{% \begin{minipage}[t]{\code@width}{% \color{textcodecolor}% @@ -180,23 +177,23 @@ \if@tempswa \leavevmode\null\@@par\penalty\interlinepenalty \everypar{\setlength\fboxsep{1pt}% - \noindent\parskip=0pt% + \noindent\parskip=0pt% \llap{\colorbox{numbackground}{\textcolor{numcolor}{% \footnotesize\number\value{code@cnt}}}\enspace}% - \stepcounter{code@cnt}}% + \stepcounter{code@cnt}}% \else \@tempswatrue \ifhmode\@@par\penalty\interlinepenalty\fi% \fi - }% - \everypar{\setlength\fboxsep{1pt}% - \noindent\parskip=0pt% + }% + \everypar{\setlength\fboxsep{1pt}% + \noindent\parskip=0pt% \llap{\colorbox{numbackground}{\textcolor{numcolor}{% - \footnotesize\number\value{code@cnt}}}\enspace}% + \footnotesize\number\value{code@cnt}}}\enspace}% \stepcounter{code@cnt}% - }% + }% \else - \typesetcomment + \typesetcomment \def\par{% \if@tempswa \leavevmode\null\@@par\penalty\interlinepenalty% @@ -208,7 +205,7 @@ \fi \obeylines \ifcode@saved\input{#1}\else#1\fi% -}% end of content for the minipage +}% end of content for the minipage \end{minipage}% }% @@ -219,7 +216,7 @@ backgroundcolor = codeonlybackground, innerleftmargin = \tkz@innerleftmargin, innertopmargin = \tkz@innertopmargin] -\begingroup +\begingroup \color{textcodecolor}% \parskip=\z@ \hrule width0pt @@ -235,22 +232,22 @@ \def\par{% \if@tempswa \leavevmode\null\@@par\penalty\interlinepenalty - \everypar{\setlength\fboxsep{1pt}% + \everypar{\setlength\fboxsep{1pt}% \noindent\parskip=0pt% \llap{\colorbox{numbackground}{\textcolor{numcolor}{% \footnotesize\number\value{code@cnt}}}\enspace}% - \stepcounter{code@cnt}}% + \stepcounter{code@cnt}}% \else \@tempswatrue \ifhmode\@@par\penalty\interlinepenalty\fi \fi -}% +}% \everypar{\setlength\fboxsep{1pt}% \noindent\parskip=0pt% \llap{\colorbox{numbackground}{\textcolor{numcolor}{% - \footnotesize\number\value{code@cnt}}}\enspace}% + \footnotesize\number\value{code@cnt}}}\enspace}% \stepcounter{code@cnt}% - }% + }% \else \typesetcomment% \def\par{% @@ -262,7 +259,7 @@ \fi }% \fi -\obeylines +\obeylines \ifcode@saved\input{#1}\else #1\fi \endgroup \end{mdframed}% @@ -284,11 +281,11 @@ inner left margin = 0 pt, inner right margin = 0 pt, inner top margin = 6 pt, - inner bottom margin = 0 pt} + inner bottom margin = 0 pt} \pgfqkeys{/tkzexample}{every tkzexample,#1}% \parindent0pt \bgroup -\VerbatimEnvironment +\VerbatimEnvironment \killienc\begin{VerbatimOut}{\tkz@File@Saved@Name.tex}}% \def\endtkzexample{\end{VerbatimOut}% \egroup @@ -299,15 +296,15 @@ % \hrule %\def\code@mid{\hfill}% \gdef\code@width{\linewidth}% -\else - \ifdim\tkz@hsep=0pt +\else + \ifdim\tkz@hsep=0pt \gdef\code@mid{\hfill}% \else - \gdef\code@mid{\hskip\tkz@hsep}% - \fi + \gdef\code@mid{\hskip\tkz@hsep}% + \fi \gdef\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}% \fi - \par\noindent + \par\noindent \code@savedtrue \ifcode@overhang \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}% @@ -315,21 +312,21 @@ \tkz@frameltxset{graphicbackground}{\tkz@result}% \fi \else% pas de code pas clair - \gdef\code@mid{\hfill}% + \gdef\code@mid{\hfill}% \gdef\code@width{\linewidth}% \gdef\code@end{}% - \fi% fin pas de code - \code@mid + \fi% fin pas de code + \code@mid \ifcode@overhang\tkz@frameltxset{graphicbackground}{\tkz@result}% \else \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}% - \fi + \fi \tkz@below }% \else% end of code saved code et result ? \def\tkzexample[#1]{% \begingroup -\code@executetrue +\code@executetrue \pgfkeys{/tkzexample/.cd, right margin = 0pt, left margin = 0pt, @@ -337,7 +334,7 @@ inner left margin = 0 pt, inner right margin = 0 pt, inner top margin = 6 pt, - inner bottom margin = 0 pt,} + inner bottom margin = 0 pt,} \pgfqkeys{/tkzexample}{every tkzexample,#1}% \parindent0pt \begingroup @@ -363,22 +360,22 @@ \ifdim\wd\tkzexamplebox>\tkzexamplewidth \def\code@mid{\par}% \def\code@width{\linewidth-6pt}% - \else - \ifdim\tkz@hsep=0pt + \else + \ifdim\tkz@hsep=0pt \def\code@mid{\hfill}% \else - \def\code@mid{\hskip\tkz@hsep}% + \def\code@mid{\hskip\tkz@hsep}% \fi% \def\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}% \fi% \par\noindent - \ifcode@overhang + \ifcode@overhang \tkz@frameset{codebackground}{\tkz@code{#1}}% \else \tkz@frameltxset{graphicbackground}{\tkz@result}% \fi \else% pas de code execute - \def\code@mid{}% + \def\code@mid{}% \def\code@width{\linewidth-6pt}% \def\code@end{}% \fi% fin pas de code @@ -400,7 +397,7 @@ %<---------------------------------------------------------------------------> \pgfqkeys{/tkzltxexample}{% width/.code = {\setlength\tkzltxexamplewidth{#1}}, - code/.code = {\colorlet{codeonlybackground}{#1}}, + code/.code = {\colorlet{codeonlybackground}{#1}}, show num/.is if = num@show, num/.code = {\num@showtrue\setcounter{code@cnt}{1}}, global num/.code = {\num@showtrue}, @@ -410,15 +407,15 @@ small/.code = {\def\code@size{\small}}, very small/.code = {\def\code@size{\footnotesize}}, right margin/.code = {\def\tkz@rightmargin{#1}}, - left margin/.code = {\def\tkz@leftmargin{#1}}, + left margin/.code = {\def\tkz@leftmargin{#1}}, inner left margin/.code = {\def\tkz@innerleftmargin{#1}}, inner right margin/.code = {\def\tkz@innerrightmargin{#1}}, inner top margin/.code = {\def\tkz@innertopmargin{#1}}, - inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}}, - line frame width/.code = {\def\tkz@linewidth{#1}}, + inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}}, + line frame width/.code = {\def\tkz@linewidth{#1}}, hsep/.code = {\def\tkz@hsep{#1}}, typeset listing/.code = {#1}, - frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}}, + frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}}, ignorespaces/.code = {\let\@gobble@till@return =% \@gobble@till@return@ignore}, leave comments/.code = {\def\code@catcode@hook{\catcode`\%=12}% @@ -475,32 +472,31 @@ -\newcommand\killienc{} -\@tempcnta128 -\@whilenum\@tempcnta<\@cclvi\do{% - \edef\killienc{\killienc\catcode\the\@tempcnta=12}% - \advance\@tempcnta\@ne} +\newcommand\killienc{} +\@tempcnta128 +\@whilenum\@tempcnta<\@cclvi\do{% + \edef\killienc{\killienc\catcode\the\@tempcnta=12}% + \advance\@tempcnta\@ne} \def\tkz@ref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}} -\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkz@ref} +\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkz@ref} \pgfkeys{ /tkzsavedcode/.cd, - prefix/.code = {\def\tkzFileSavedPrefix{#1}}} + prefix/.code = {\def\tkzFileSavedPrefix{#1}}} \newcommand{\tkzSavedCode}[1][]{% \pgfkeys{% tkzsavedcode/.cd, prefix = tkzFile} \pgfqkeys{/tkzsavedcode}{#1} -\renewenvironment{tkzexample}[1][]{% -\killienc\VerbatimOut{\tkz@File@Saved@Name.tex}}{% +\renewenvironment{tkzexample}[1][]{% +\killienc\VerbatimOut{\tkz@File@Saved@Name.tex}}{% \endVerbatimOut}} - -% \renewenvironment{tkzexample}[1][]{% -% \killienc \VerbatimOut{tkzeuc-\tkzref.tex}% -% }{% -% \endVerbatimOut -% } -% \fi -\endinput +% \renewenvironment{tkzexample}[1][]{% +% \killienc \VerbatimOut{tkzeuc-\tkzref.tex}% +% }{% +% \endVerbatimOut +% } +% \fi +\endinput diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 164291e4655..e17de2d6524 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -4,10 +4,11 @@ # Originally written by Sebastian Rahtz. Comments to tex-live@tug.org. # # A script to TL-install a package from CTAN. -# For a higher-level invocation, see ctan2tl. +# For the higher-level invocation that is what should be used in practice, +# see tlpkg/bin/ctan2tl. # # Its default actions, given a "raw" directory copied from CTAN (the -# current directory on invocation), are +# current directory on invocation), are, approximately, # 1. copy everything to texmf-dist/doc/<format>/<package> # 2. run any .ins files # 3. run any .mf files through mktextfm |