From 52b7027c0c88a76cc7213b1c1ff857c6a3a51b79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Feb 2020 22:07:48 +0000 Subject: euclideangeometry (9feb20) git-svn-id: svn://tug.org/texlive/trunk@53738 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/euclideangeometry/euclideangeometry.sty | 194 ++++++--------------- 1 file changed, 49 insertions(+), 145 deletions(-) (limited to 'Master/texmf-dist/tex/latex/euclideangeometry') diff --git a/Master/texmf-dist/tex/latex/euclideangeometry/euclideangeometry.sty b/Master/texmf-dist/tex/latex/euclideangeometry/euclideangeometry.sty index 77807562370..b6524bf0cb7 100644 --- a/Master/texmf-dist/tex/latex/euclideangeometry/euclideangeometry.sty +++ b/Master/texmf-dist/tex/latex/euclideangeometry/euclideangeometry.sty @@ -11,108 +11,42 @@ %% \NeedsTeXFormat{LaTeX2e}[2019/01/01] \ProvidesPackage{euclideangeometry}% - [2020-02-02 v.0.1.2 Extension package for curve2e] - -\makeatletter -\providecommand\GetFileInfo{} -\renewcommand\GetFileInfo[1]{% - \def\filename{#1}% - \def\@tempb##1 v.##2 ##3\relax##4\relax{% - \def\filedate{##1}\def\fileversion{##2}\def\fileinfo{##3}}% - \edef\@tempa{\csname ver@#1\endcsname}% - \expandafter\@tempb\@tempa\relax? ? \relax\relax} -\def\cleanfiledate#1-#2-#3!{\unless\ifx#3\empty -\edef\FileDate{#1#2#3}\else\unless\ifx#2\empty -\edef\FileDate{#1#2}\else\edef\FileDate{#1}\fi\fi} + [2020-02-09 v.0.1.3 Extension package for curve2e] + \RequirePackage{curve2e} -\GetFileInfo{curve2e.sty} -\expandafter\cleanfiledate\filedate! - -\ifnum\FileDate<20200118 -\typeout{*************************************************************} -\typeout{Package curve2e too old} -\typeout{Be sure that your TeX installation is complete and up to date} -\typeout{*************************************************************} -\typeout{Input of euclideangeometry stopped and job aborted} -\typeout{*************************************************************} -\expandafter\@@end\fi - -\providecommand\file{} -\renewcommand*\file[1]{{\normalfont\texttt{#1}}} -\providecommand\prog{} -\renewcommand*\prog[1]{{\normalfont\texttt{#1}}} -\newcommand*\conta[1]{\texttt{\slshape#1}} -\providecommand\cs{} -\renewcommand\cs[1]{{\normalfont\texttt{\char92#1}}} -\providecommand\meta{} -\renewcommand*\meta[1]{{\normalfont$\langle$\textit{#1}$\rangle$}} -\providecommand\marg{} -\renewcommand*\marg[1]{{\ttfamily \char123\meta{#1}\char125}} -\newcommand*\Marg[1]{{\normalfont\ttfamily\{#1\}}}\let\Arg\Marg -\providecommand\oarg{} -\renewcommand*\oarg[1]{{\ttfamily[\meta{#1}]}} -\newcommand*\Oarg[1]{{\ttfamily[#1]}} -\newcommand*\aarg[1]{{\ttfamily{<\meta{#1}>}}} -\newcommand*\Aarg[1]{{\ttfamily<#1>}} -\newcommand*\Bambiente[1]{\texttt{\char92begin\{#1\}}} -\newcommand*\Eambiente[1]{\texttt{\char92end\{#1\}}} -\newcommand*\garg[1]{\texttt{(\splitgarg#1,!)}}\let\parg\garg -\newcommand*\Garg[1]{\texttt{(#1)}}\let\Parg\Garg - \def\secgarg#1,{#1} - \def\splitgarg#1,#2!{% - \ifstrequal{#2}{}{\meta{#1}}{\meta{#1},\meta{\secgarg#2}}} -\providecommand\pack{} -\renewcommand*\pack[1]{{\normalfont\textsf{#1}}} -\providecommand\opt{} -\renewcommand*\opt[1]{{\normalfont\textsl{#1}}}\let\opz\opt -\providecommand\env{} -\renewcommand*\env[1]{{\normalfont\textit{\bfseries#1}}}\let\amb\env -\providecommand*\ped[1]{\ensuremath{_{\mathrm{#1}}}} -\providecommand*\ap[1]{\ensuremath{^{\mathrm{#1}}}} -\providecommand*\unit[1]{\ensuremath{\,\mathrm{#1}}} -\providecommand*\sigla[1]{\textsc{\lowercase{#1}}} -\providecommand*\iu{\ensuremath{\mathrm{i}}}\let\gei\iu -\providecommand*\eu{\ensuremath{\mathop{\mathrm{e}}\nolimits}} -\DeclareRobustCommand*{\Ars}{% - \textsf{\lower -.48ex\hbox{\rotatebox{-20}{A}}\kern -.3em{rs}}% - \kern -.05em\TeX\unskip\kern -.17em\lower -.357ex\hbox{nica}\xspace} - -\DeclareRobustCommand*\LyX{% - L\kern-0.2em\raisebox{-0.5ex}{Y}\kern-0.2em{X}\xspace} +\@ifpackagelater{curve2e}{2020/01/18}{}% + {% + \typeout{*************************************************************} + \typeout{Package curve2e too old} + \typeout{Be sure that your TeX installation is complete and up to date} + \typeout{*************************************************************} + \typeout{Input of euclideangeometry stopped and job aborted} + \typeout{*************************************************************} + \@@end + }% + \definecolor{verdeguit}{rgb}{0, 0.40, 0} -\RequirePackage{iftex} \def\GuIT{\mbox{\color{verdeguit}\def\I{\textcolor{black}{I}}% -\ifPDFTeX - \usefont{T1}{lmr}{m}{sc} -\else - \usefont{TU}{lmr}{m}{sc} -\fi + \fontfamily{lmr}\fontseries{m}\fontshape{sc}\selectfont g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} -\providecommand*\usecs[1]{\csname#1\endcsname} -\providecommand*\whilenum[2]{\usecs{@whilenum}#1\do{#2}} -\RequirePackage{afterpage} -\providecommand\supaginapari[1]{% - \afterpage{% - \ifodd\value{page}\expandafter\@firstoftwo - \else\expandafter\@secondoftwo - \fi{\supaginapari{#1}}{#1} - } -}\let\onevenpage\supaginapari -\providecommand\supaginadispari[1]{% - \afterpage{% - \ifodd\value{page}\expandafter\@secondoftwo - \else\expandafter\@firstoftwo - \fi{\supaginadispari{#1}}{#1} - } -}\let\onoddpage\supaginadispari \RequirePackage{etoolbox} \AfterEndPreamble{% -\apptocmd{\TeX}{{}\xspace}{}{} -\apptocmd{\LaTeX}{{}\xspace}{}{}} +\DeclareRobustCommand{\TeX}{T\kern-.1667em + \lower.5ex\hbox{E}\kern-.125emX\@\xspace} +\DeclareRobustCommand{\LaTeX}{L\kern-.36em% + {\sbox\z@ T% + \vbox to\ht\z@{\hbox{\check@mathfonts + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + A}% + \vss}% + }% + \kern-.15em% + \TeX}} \DeclareRobustCommand*\TeXLive{\TeX\ Live\xspace} -\DeclareRobustCommand*\MiKTeX{MiK\TeX} +\DeclareRobustCommand*\MikTeX{Mik\TeX} \DeclareRobustCommand*\MacTeX{Mac\TeX} \DeclareRobustCommand*\pdfLaTeX{pdf\/\LaTeX} \DeclareRobustCommand*\LuaLaTeX{Lua\LaTeX} @@ -121,9 +55,7 @@ g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} \ifdim\fontdimen1\font=0pt\kern-0.15em\else\kern-0.275em\fi \LaTeX} \DeclareRobustCommand*\TikZ{Ti\emph{k}Z\xspace} -\DeclareRobustCommand*\TUGboat{\textsl{TUG\-boat}\xspace} -\renewcommand\dbltopfraction{1.} -\def\hz{\hskip0pt} + \newenvironment{ttsintassi}{\begin{lrbox}{0} \minipage{\dimexpr\linewidth-2\fboxrule-2\fboxsep}\ttfamily\obeylines}% {\endminipage\end{lrbox}\center\fbox{\box0}\endcenter} @@ -135,11 +67,11 @@ g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} \IfValueTF{#2}{\put(#1){\originalGraphGrid(#2)}}% {\put(0,0){\originalGraphGrid(#1)}}}\fi \providecommand\Pbox{} +\newlength\PbDim \RenewDocumentCommand\Pbox{D(){0,0} O{cc} m O{0.5ex} s D<>{0}}{% \put(#1){\rotatebox{#6}{\makebox(0,0){% -\dimendef\Dim=2566\relax -\settowidth\Dim{#2}% -\edef\Rapp{\fpeval{\Dim/{1ex}}}% +\settowidth\PbDim{#2}% +\edef\Rapp{\fpeval{\PbDim/{1ex}}}% \fptest{\Rapp > 1.5}{\fboxsep=0.5ex}{\fboxsep=0.75ex}% \IfBooleanTF{#5}{\fboxrule=0.4pt}{\fboxrule=0pt}% \fptest{#4 = 0sp}% @@ -153,57 +85,29 @@ g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} \linespread{#1}\fontsize{#2}{#2}\selectfont} \def\EUGsplitArgs(#1,#2)#3#4{\edef#3{#1}\edef#4{#2}} - +\newlength\EUGZbox \providecommand\Zbox{} -\RenewDocumentCommand\Zbox{R(){0,0} D(){0,0} O{bl} m}{% -\EUGsplitArgs(#2)\ZboxX\ZboxY % separa la x e la y della scatola +\RenewDocumentCommand\Zbox{r() D(){0,0} O{bl} m}{% +\EUGsplitArgs(#2)\ZboxX\ZboxY % splits box dimensions \fboxsep=2\unitlength -\ifnum\ZboxX=\csuse{z@} +\ifnum\ZboxX=\z@ \def\ZTesto{\fbox{#4}}% \else - \ifnum\ZboxY=\csuse{z@} + \ifnum\ZboxY=\z@ \def\ZTesto{\fbox{\parbox{\ZboxX\unitlength}{#4}}}% \else \def\ZTesto{% - \setbox2560=\hbox{\fbox{% + \setbox\EUGZbox=\hbox{\fbox{% \parbox[c][\ZboxY\unitlength][c]{\ZboxX\unitlength}{#4}}}% - \dimen2560=\dimexpr(\ht2560 +\dp2560)/2\relax - \ht2560=\dimen2560\relax - \dp2560=\dimen2560\relax - \box2560% + \dimen\EUGZbox=\dimexpr(\ht\EUGZbox +\dp\EUGZbox)/2\relax + \ht\EUGZbox=\dimen\EUGZbox\relax + \dp\EUGZbox=\dimen\EUGZbox\relax + \box\EUGZbox% }% \fi \fi \put(#1){\makebox(0,0)[#3]{\ZTesto}}\ignorespaces} -\RequirePackage{verbatim} -\newwrite\example@out -\ProvideDocumentEnvironment{Esempio}{s O{\normalsize} D(){0.40}} -{\par\addvspace{3.0ex plus 0.8ex minus 0.5ex}\vskip -\parskip -\dimendef\Wboxu=2570 \dimendef\Wboxd=2572 -\Wboxu=#3\textwidth\relax -\Wboxd=\dimexpr\linewidth-\columnsep-\Wboxu\relax -\begingroup -\@bsphack -\immediate\openout\example@out\jobname-temp.tex -\let\do\@makeother\dospecials\catcode`\^^M\active -\def\verbatim@processline{% - \immediate\write\example@out{\the\verbatim@line}}% -\verbatim@start\relax}% -{\immediate\closeout\example@out\@esphack\endgroup -\begin{minipage}{\textwidth}% -\IfBooleanTF{#1}{\begin{minipage}{\textwidth}}{\begin{minipage}{\Wboxu}}% -#2\relax -\verbatiminput{\jobname-temp.tex} -\end{minipage}% -\IfBooleanTF{#1}{\par\bigskip}{\hfill}% -\IfBooleanTF{#1}{\begin{minipage}{\textwidth}}{\begin{minipage}{\Wboxd}}% -\raggedleft -\input{\jobname-temp} -\end{minipage} -\end{minipage}\par -} - \NewDocumentCommand\ellisse{ s m m}{% \IfBooleanTF{#1}% @@ -235,7 +139,7 @@ g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} \XpartOfVect\IntPu to \xu \YpartOfVect\IntPu to \yu \XpartOfVect\IntPd to \xd \YpartOfVect\IntPd to \yd \edef\Den{\fpeval{-(\a*\d-\b*\c)}}% - \fptest{abs(\Den)<1e-5}{% almost vanishing determinant + \fptest{abs(\Den)<1e-5}{% Almost vanishing determinant \def#5{0,0}% }{% Determinant OK \edef\Numx{\fpeval{(\c*(\b*\xu-\a*\yu)-\a*(\d*\xd-\c*\yd))/\Den}}% @@ -248,13 +152,13 @@ g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} \SubVect#3from#4to\IoSvectd \DirOfVect\IoSvectd to\DirIoSVecd \IntersectionOfLines(#1)(\DirIoSVecu)and(#3)(\DirIoSVecd)to#5\ignorespaces} -\NewDocumentCommand\ThreePointCircle{s d() d() d()}{% +\NewDocumentCommand\ThreePointCircle{s r() r() r()}{% \AxisOf#2and#3to\Mu\Du \AxisOf#2and#4to\Md\Dd \IntersectionOfLines(\Mu)(\Du)and(\Md)(\Dd)to\C \SubVect#2from\C to\R \IfBooleanTF{#1}{\CircleWithCenter\C Radius\R}{}\ignorespaces} -\NewDocumentCommand\ThreePointCircleCenter{d() d() d() m}{% +\NewDocumentCommand\ThreePointCircleCenter{r() r() r() m}{% \ThreePointCircle(#1)(#2)(#3)\CopyVect\C to#4} \def\CircleWithCenter#1Radius#2{\put(#1){\ModOfVect#2to\CWR \circle{\fpeval{2*\CWR}}}\ignorespaces} @@ -393,15 +297,15 @@ g\raisebox{-0.715ex}{\kern-0.26em u}\kern-0.13em\I\kern-0.14em t}\xspace} \IfValueTF{#9}{\let\fillstroke\strokepath #9\Sellisse{#5}{#7}[#4]}{}}}% \ignorespaces} - +\newcount\RPI \NewDocumentCommand\RegPolygon{s D(){0,0} m m O{0} D<>{\relax} }{{% -\countdef\I=258 \I=0 +\RPI=0 \CopyVect#5:#3to\P \CopyVect\fpeval{360/#4}:1to\R \put(#2){#6\relax - \moveto(\P)\fpdowhile{\I < #4}% - {\MultVect\P by\R to\P%\GetCoord(\P)\X\Y - \lineto(\P)\advance\I by 1}% + \moveto(\P)\fpdowhile{\RPI < #4}% + {\MultVect\P by\R to\P + \lineto(\P)\advance\RPI by 1}% \IfBooleanTF{#1}% {\fillpath}{#6\strokepath}}}\ignorespaces} %%%%%%%%% -- cgit v1.2.3