summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex')
-rw-r--r--Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex31
1 files changed, 14 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex b/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
index bbf56086c41..4138294c1a5 100644
--- a/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
+++ b/Master/texmf-dist/tex/generic/xypic/xypdf-fr.tex
@@ -8,7 +8,7 @@
%%
%% The xypdf package for TeX and LaTeX
%% Copyright (c) 2010 by Daniel Müllner (M\"ullner)
-%% <http://math.stanford.edu/\protect \unhbox \voidb@x \penalty \@M \ {}muellner>
+%% <http://math.stanford.edu/~muellner>
%% --------------------------------------------------------------------------
%%
%% This program is free software: you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
%%
\xyrequire{curve}\xycatcodes
\expandafter\let\csname xypdf-fr@loaded\endcsname\@empty
-\newcommand*\xP@framedrop[1]{\expandafter\frmDrop@\expandafter{\expandafter\def\expandafter\prevEdge@@\expandafter{\prevEdge@@}#1\frmradius@@}}
+\newcommand*\xP@framedrop[1]{\expandafter\frmDrop@\expandafter{\expandafter\def\expandafter\prevEdge@@\expandafter{\prevEdge@@}\setboxz@h{#1\frmradius@@}\styledboxz@}}
\xP@hook{frame}{frm{-}}
\expandafter\newcommand\expandafter*\csname xP@frm{-}\endcsname{\xP@framedrop\xP@solidframe
}
@@ -68,10 +68,13 @@
\let\xP@fillorstroke\xP@stroke
\xP@frameifnotzero\xP@oval
}
-\newcommand*\xP@frameifnotzero[1]{\setboxz@h{\hskip\X@c\raise\Y@c\hbox{\DN@{\zeroEdge}\ifx\next@\prevEdge@@
-\else
-#1\fi
-}}\wd\z@\z@\ht\z@\z@\dp\z@\z@
+\newcommand*\xP@ifzerosize[2]{\@tempswafalse
+\ifdim\L@c=\z@\ifdim\R@c=\z@\ifdim\U@c=\z@\ifdim\D@c=\z@
+\@tempswatrue
+\fi\fi\fi\fi
+\if@tempswa#1\else#2\fi
+}
+\newcommand*\xP@frameifnotzero[1]{\setboxz@h{\hskip\X@c\raise\Y@c\hbox{\xP@ifzerosize{}{#1}}}\wd\z@\z@\ht\z@\z@\dp\z@\z@
\boxz@
}
\newcommand*\xP@oval{\hskip-\L@c
@@ -92,12 +95,9 @@
}}
\xP@hook{frame}{frm[o]{-}}
\expandafter\newcommand\expandafter*\csname xP@frm[o]{-}\endcsname{\xP@framedrop{\xP@ellipseframe\xP@setsolidpat}}
-\newcommand*\xP@ellipseframe[2]{\xP@getradii{#2}\DN@{\zeroEdge}\ifx\next@\prevEdge@@
-\else
-\def\xP@fillorstroke{#1\xP@stroke}\setboxz@h{\hskip\X@c\raise\Y@c\hbox{\xP@framedellipse}}\wd\z@\z@\ht\z@\z@\dp\z@\z@
+\newcommand*\xP@ellipseframe[2]{\xP@getradii{#2}\xP@ifzerosize{}{\def\xP@fillorstroke{#1\xP@stroke}\setboxz@h{\hskip\X@c\raise\Y@c\hbox{\xP@framedellipse}}\wd\z@\z@\ht\z@\z@\dp\z@\z@
\boxz@
-\fi
-}
+}}
\xP@hook{frame}{frm{.}}
\expandafter\newcommand\expandafter*\csname xP@frm{.}\endcsname{\xP@framedrop\xP@rectframedotted
}
@@ -284,19 +284,16 @@
\xP@hook{frame}{frm{.o}}
\expandafter\newcommand\expandafter*\csname xP@frm{.o}\endcsname{\xP@framedrop{\xP@circleframe\xP@setcldottedpat}}
\newcommand*\xP@circleframe[2]{\R@#2\relax
-\def\xP@fillorstroke{#1\xP@stroke}\DN@{\zeroEdge}\ifx\next@\prevEdge@@
-\ifdim\R@>\z@
+\def\xP@fillorstroke{#1\xP@stroke}\xP@ifzerosize{\ifdim\R@>\z@
\xP@circleframe@
\fi
-\else
-\ifdim\R@=\z@
+}{\ifdim\R@=\z@
\A@\dimexpr(\L@c+\R@c)/2\relax
\B@\dimexpr(\U@c+\D@c)/2\relax
\R@\xP@max\A@\B@
\fi
\xP@circleframe@
-\fi
-}
+}}
\newcommand*\xP@circleframe@{\setboxz@h{\hskip\X@c\raise\Y@c\hbox{\xP@circle}}\wd\z@\z@\ht\z@\z@\dp\z@\z@
\boxz@
}