diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/pxpic/pxpic.sty | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/pxpic/pxpic.sty b/Master/texmf-dist/tex/latex/pxpic/pxpic.sty index 3a8c73ff023..e18ad4a23e9 100644 --- a/Master/texmf-dist/tex/latex/pxpic/pxpic.sty +++ b/Master/texmf-dist/tex/latex/pxpic/pxpic.sty @@ -29,17 +29,20 @@ %% and the derived files pxpic.pdf %% pxpic.sty %% -\ProvidesPackage{pxpic}[2021-01-10 v1.0 draw pixel pictures] +\ProvidesPackage{pxpic}[2021-01-13 v1.1 draw pixel pictures] \RequirePackage{xcolor} \RequirePackage{expkv} \@ifdefinable\pxpicHT{\newdimen\pxpicHT} \@ifdefinable\pxpicWD{\newdimen\pxpicWD} -\pxpicHT=1pt -\pxpicWD=\pxpicHT +\pxpicHT1pt +\pxpicWD\pxpicHT +\@ifdefinable\pxpic@kern{\newdimen\pxpic@kern} +\pxpic@kern\z@ \protected\ekvdef{pxpic}{size} - {\pxpicHT=\dimexpr#1\relax\pxpicWD=\dimexpr#1\relax} -\protected\ekvdef{pxpic}{ht}{\pxpicHT=\dimexpr#1\relax} -\protected\ekvdef{pxpic}{wd}{\pxpicWD=\dimexpr#1\relax} + {\pxpicHT\dimexpr#1\relax\pxpicWD\dimexpr#1\relax} +\protected\ekvdef{pxpic}{ht}{\pxpicHT\dimexpr#1\relax} +\protected\ekvdef{pxpic}{wd}{\pxpicWD\dimexpr#1\relax} +\protected\ekvdef{pxpic}{gap-hack}{\pxpic@kern\dimexpr#1\relax} \protected\ekvdef{pxpic}{skip}{\ekvdefNoVal{pxpic@px}{#1}{\pxskip}} \protected\ekvdef{pxpic}{colors}{\ekvparse\pxpic@noval\pxpic@setcolor{#1}} \ekvletkv{pxpic}{colours}{pxpic}{colors} @@ -61,6 +64,7 @@ \let\px\pxpic@px \let\pxskip\pxpic@skip \baselineskip\pxpicHT + \kern\pxpic@kern \pxpic@parse#2\pxpic@end }% \egroup @@ -105,17 +109,21 @@ \newcommand\pxpic@parse[1] {% \pxpic@ifend#1\pxpic@done\pxpic@end - \hbox{\pxpic@parseline#1\pxpic@end}% + \kern-\pxpic@kern + \hbox{\kern\pxpic@kern\pxpic@parseline#1\pxpic@end}% \pxpic@parse } -\long\def\pxpic@done\pxpic@end\hbox#1\pxpic@parse{} +\long\def\pxpic@done\pxpic@end\kern-\pxpic@kern\hbox#1\pxpic@parse{} \newcommand\pxpic@parseline[1] {% \pxpic@ifend#1\pxpic@linedone\pxpic@end + \kern-\pxpic@kern \pxpic@parse@px{#1}% \pxpic@parseline } -\long\def\pxpic@linedone\pxpic@end\pxpic@parse@px#1\pxpic@parseline{} +\long\def\pxpic@linedone + \pxpic@end\kern-\pxpic@kern\pxpic@parse@px#1\pxpic@parseline + {} \newcommand\pxpic@parse@px@px[1] {% \ekvifdefinedNoVal{pxpic@px}{#1} |