summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-22 21:49:26 +0000
committerKarl Berry <karl@freefriends.org>2018-12-22 21:49:26 +0000
commit064f129c479cbbbf18976c1250f880bb4e2fab56 (patch)
tree008f2345b18193191ee96be329aead2c768e25cc /Master/texmf-dist/tex
parente246c1a36719fa89b7c182dfa7ec587005b43fff (diff)
pst-text (22dec18)
git-svn-id: svn://tug.org/texlive/trunk@49477 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-text/pst-char.tex5
-rw-r--r--Master/texmf-dist/tex/generic/pst-text/pst-text.tex70
2 files changed, 61 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/pst-text/pst-char.tex b/Master/texmf-dist/tex/generic/pst-text/pst-char.tex
deleted file mode 100644
index 93e7a9594fe..00000000000
--- a/Master/texmf-dist/tex/generic/pst-text/pst-char.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-%% BEGIN pst-char.tex
-%%
-\input pst-text
-
-\endinput
diff --git a/Master/texmf-dist/tex/generic/pst-text/pst-text.tex b/Master/texmf-dist/tex/generic/pst-text/pst-text.tex
index 02de2985623..b38689418e5 100644
--- a/Master/texmf-dist/tex/generic/pst-text/pst-text.tex
+++ b/Master/texmf-dist/tex/generic/pst-text/pst-text.tex
@@ -6,7 +6,7 @@
%%
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% 2006 Herbert Voss <hvoss@tug.org>
+%% 2006, 2019 Herbert Voss <hvoss@tug.org>
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -18,14 +18,17 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
%\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
%
-\def\fileversion{1.00}
-\def\filedate{2006/11/05}
+\def\fileversion{1.01}
+\def\filedate{2018/12/22}
\message{ v\fileversion, \filedate (tvz,hv)}
\edef\TheAtCode{\the\catcode`\@}
\catcode`\@=11
-%\pst@addfams{pst-text}
+\pst@addfams{pst-text}
+
+
+
\pstheader{pst-text.pro}
%
\def\pstextpath{\@ifnextchar[{\pstextpath@}{\pstextpath@[l]}}
@@ -50,7 +53,7 @@
\tx@STV
CP translate
newpath
- \pst@code\space
+ \pst@code
mtrxc setmatrix
0 setgray}%
\gdef\pst@code{}}%
@@ -89,7 +92,8 @@
\leavevmode
\hbox{{#4}\box\pst@hbox}%
\endgroup\ignorespaces}
-\def\TPoffset{-.7ex}
+%
+\def\TPoffset{-0.7ex}
%
\def\tx@CharPathShow{%
/tx@CharPathSavedShow /show load def
@@ -125,13 +129,13 @@
\showpointsfalse
\let\pst@newpath\@empty
\def\use@pscode{%
- \pst@Verb{%
+ \pst@Verb{
gsave
\tx@STV
\pst@code
grestore
% DG/SR modification begin - Jul. 3, 1998 / Mar. 11, 1999 - Patches 1 and 3
-% \if@star\else CP newpath moveto \fi}}%
+% \if@star\else CP newpath moveto \fi}}%
\if@star\else CP newpath moveto \fi}%
\gdef\pst@code{}}%
% DG/SR modification end
@@ -149,8 +153,56 @@
\ignorespaces}
\def\endpscharclip{\pst@misplaced\endpscharclip}
%
-\catcode`\@=\TheAtCode\relax
+\define@key[psset]{pst-text}{font}[NimbusSanL-Regu]{\def\psk@warpfont{#1 }}
+\define@key[psset]{pst-text}{fontsize}[24pt]{\pst@getlength{#1}\psk@warpfontsize}
+\psset[pst-text]{font=NimbusSanL-Regu,fontsize=24pt}
+\def\psWarp{\def\pst@par{}\pst@object{psWarp}}
+\def\psWarp@i{\@ifnextchar(\psWarp@ii{\psWarp@ii(0,0)}}
+\def\psWarp@ii(#1)#2{%
+ \addbefore@par{linewidth=0.1pt,doublecolor=blue}%
+ \begin@ClosedObj
+ \pst@getcoor{#1}\pst@tempCoor
+ \pstverb{
+ /\psk@warpfont findfont \psk@warpfontsize\space scalefont setfont
+ /amplitude \psk@warpfontsize\space 0.75 mul def
+ /damplitude amplitude 1.05 mul def
+ /warptxt (#2) def
+ /warpwidth warptxt stringwidth pop def
+ /warphalf warpwidth 2 div def
+ \pst@tempCoor translate
+ 0 \psk@warpfontsize\space neg moveto
+ 0 amplitude moveto %%% orig
+ 0 1 warpwidth { amplitude lineto } for
+ warpwidth -1 0 { damplitude lineto } for
+ closepath
+ tx@TextPathDict begin
+ warpit
+ gsave
+ \pst@usecolor\psdoublecolor
+ fill
+ grestore
+ \pst@number\pslinewidth setlinewidth
+ stroke
+ end
+ 0 0 moveto
+ warptxt true charpath
+ tx@TextPathDict begin
+ warpit
+ gsave
+ \pst@usecolor\psfillcolor
+ fill
+ grestore
+ \pst@number\pslinewidth setlinewidth
+ stroke
+ end
+ }
+ \end@ClosedObj
+}
+
+
+%
+\catcode`\@=\TheAtCode\relax
\endinput
%%
%% END pst-text.tex