summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-30 22:11:51 +0000
committerKarl Berry <karl@freefriends.org>2018-12-30 22:11:51 +0000
commit5a8b5044b55dfb4e76f990eb433c7e229906c162 (patch)
tree6ce99f31e044b1b5bbd52eb7300f201763cd6f2d
parentbb7737fd4c99d8110fadbf69be86d62160650916 (diff)
pst-text (30dec18)
git-svn-id: svn://tug.org/texlive/trunk@49542 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-text/Changes4
-rw-r--r--Master/texmf-dist/doc/generic/pst-text/README2
-rw-r--r--Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdfbin180174 -> 207384 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex50
-rw-r--r--Master/texmf-dist/dvips/pst-text/pst-text.pro30
-rw-r--r--Master/texmf-dist/tex/generic/pst-text/pst-text.tex35
-rw-r--r--Master/texmf-dist/tex/latex/pst-text/pst-char.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pst-text/pst-text.sty8
8 files changed, 121 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-text/Changes b/Master/texmf-dist/doc/generic/pst-text/Changes
index 3798d49a878..7d351cfafce 100644
--- a/Master/texmf-dist/doc/generic/pst-text/Changes
+++ b/Master/texmf-dist/doc/generic/pst-text/Changes
@@ -1,13 +1,17 @@
pst-text.sty --------
+2018-12-28 - added version info for pro file
2006-01-01
+
pst-text.tex --------
+1.02 2018-12-28 - added \psCircleText for circled outline text
1.01 2018-12-22 - added \psWarp for warping text
1.00 2006-11-06 - integrate the pst-char stuff, which is
now obsolete. (hv)
pst-text.pro --------
+1.02 2018-12-28 - added \psCircleText for circled text
1.01 2018-12-22 - added \psWarp for warping text
1.00 2006-11-06 - add a patch for japanese text (hv)
- first CTAN contrib version (hv)
diff --git a/Master/texmf-dist/doc/generic/pst-text/README b/Master/texmf-dist/doc/generic/pst-text/README
index 9e508dc13ea..6c8394a4e98 100644
--- a/Master/texmf-dist/doc/generic/pst-text/README
+++ b/Master/texmf-dist/doc/generic/pst-text/README
@@ -2,8 +2,10 @@
\pscharpath
\pstextpath
+\psCircleText
\psWarp
+
pst-text.sty - The LaTeX file
pst-text.tex - The TeX file
pst-text.pro - The dvips header file
diff --git a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf
index a9031cd9b9a..faf0eb62c6f 100644
--- a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex
index d5801859495..a3617818d8b 100644
--- a/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-text/pst-text-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-text-doc.tex 873 2018-12-22 19:34:12Z herbert $
+%% $Id: pst-text-doc.tex 887 2018-12-29 13:17:59Z herbert $
\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,
headings=small, headinclude=false,footinclude=false,oneside,abstract=on]{pst-doc}
\usepackage{pst-plot,pst-grad,pst-text}
@@ -469,6 +469,54 @@ It should be kept in mind that alternatively \Lcs{pscharpath} may be
used in conjunction with \Lcs{psboxfill}.
+\section{Writing outline text on a circle}
+
+\begin{BDef}
+\Lcs{psCircleText}\OptArgs\OptArg{\Largr{x,y}}\Largb{Text}
+\end{BDef}
+
+Optional arguments are
+
+\begin{description}
+\item[\texttt{font}] Textfont, predefined as NimbusSanL-Regu. It must be a PostScript font.
+\item[\texttt{fontsize}] Predefined to 24pt
+\item[\texttt{fillcolor}] Predefined as red!40
+\item[\texttt{radius}] The radius for the circled text
+\end{description}
+
+
+\begin{pspicture}[showgrid](10,10)
+\psCircleText[fontsize=6.5mm,radius=4cm](5,5){All is Fun with the typesetting system TeX}%
+\psCircleText[fillcolor=blue!40,fontsize=1cm,font=Helvetica](5,5){All is Fun within the World}%
+\end{pspicture}
+
+
+\begin{lstlisting}
+\begin{pspicture}[showgrid](10,10)
+\psCircleText[fontsize=6.5mm,radius=4cm](5,5){All is Fun with the typesetting system TeX}%
+\psCircleText[fillcolor=blue!40,fontsize=1cm,font=Helvetica](5,5){All is Fun within the World}%
+\end{pspicture}
+\end{lstlisting}
+
+The radius is preset to 2cm:
+
+\begin{pspicture}(10,10)
+\psCircleText[fontsize=6.5mm,radius=4cm](5,5){All is Fun with the typesetting system TeX}%
+\psCircleText[fillcolor=blue!40,fontsize=1cm,font=Helvetica](5,5){All is Fun within the World}%
+\pscircle[linecolor=red](5,5){4cm}\pscircle[linecolor=blue](5,5){2cm}
+\end{pspicture}
+
+
+\begin{lstlisting}
+\begin{pspicture}(10,10)
+\psCircleText[fontsize=6.5mm,radius=4cm](5,5){All is Fun with the typesetting system TeX}%
+\psCircleText[fillcolor=blue!40,fontsize=1cm,font=Helvetica](5,5){All is Fun within the World}%
+\pscircle[linecolor=red](5,5){4cm}\pscircle[linecolor=blue](5,5){2cm}
+\end{pspicture}
+\end{lstlisting}
+
+
+
\section{Warping a text}
\begin{BDef}
diff --git a/Master/texmf-dist/dvips/pst-text/pst-text.pro b/Master/texmf-dist/dvips/pst-text/pst-text.pro
index f4fb7ca43aa..e60e2e6c51e 100644
--- a/Master/texmf-dist/dvips/pst-text/pst-text.pro
+++ b/Master/texmf-dist/dvips/pst-text/pst-text.pro
@@ -1,6 +1,8 @@
%!
+% $Id: pst-text.pro 891 2018-12-29 19:42:20Z herbert $
+%
% PostScript header file pst-text.pro
-% Version 1.01, 2018-12-22 (hv)
+% Version 1.02, 2018-12-28 (hv)
% For distribution, see pstricks.tex.
%
/tx@TextPathDict 45 dict def
@@ -131,5 +133,31 @@ tx@TextPathDict begin
pop
} def
%
+/circle {
+ exch neg
+ % .5 mul
+ 90 add
+ dup cos 2 index mul
+ 3 1 roll
+ sin mul
+} bind def
+
+/circmove{
+ 2 index { newpath } if
+ circle moveto
+ pop false
+} bind def
+
+/circline { circle lineto } bind def
+
+/circcurve {
+ 6 2 roll circle
+ 6 2 roll circle
+ 6 2 roll circle
+ curveto
+} bind def
+
+/circit { true { circmove } { circline } { circcurve } { closepath } pathforall pop } bind def
+%
end
% END pst-text.pro \ No newline at end of file
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 b38689418e5..06cd499c8ed 100644
--- a/Master/texmf-dist/tex/generic/pst-text/pst-text.tex
+++ b/Master/texmf-dist/tex/generic/pst-text/pst-text.tex
@@ -1,4 +1,5 @@
%% BEGIN pst-text.tex
+%% $Id: pst-text.tex 891 2018-12-29 19:42:20Z herbert $
%%
%% Placing text on a path with PSTricks 97.
%% See the PSTricks User's Guide for description.
@@ -6,7 +7,7 @@
%%
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% 2006, 2019 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
@@ -27,8 +28,6 @@
\pst@addfams{pst-text}
-
-
\pstheader{pst-text.pro}
%
\def\pstextpath{\@ifnextchar[{\pstextpath@}{\pstextpath@[l]}}
@@ -199,9 +198,35 @@
}
\end@ClosedObj
}
-
-
%
+\def\psCircleText{\def\pst@par{}\pst@object{psCircleText}}
+\def\psCircleText@i{\@ifnextchar(\psCircleText@ii{\psCircleText@ii(0,0)}}
+\def\psCircleText@ii(#1)#2{%
+ \addbefore@par{fillcolor=red!40,linewidth=0.01pt,radius=2cm}%
+ \begin@ClosedObj
+ \pst@getcoor{#1}\pst@tempCoor
+ \pssetlength\pst@dimb\psk@radius
+ \pstverb{
+ /\psk@warpfont findfont \psk@warpfontsize\space scalefont setfont
+ /circtxt (#2) def
+ /circwidth circtxt stringwidth pop def
+ \pst@tempCoor translate
+ circwidth 2 div neg \pst@number\pst@dimb moveto
+ circtxt true charpath
+ tx@TextPathDict begin
+ circit
+ gsave
+ \pst@usecolor\psfillcolor
+ fill
+ grestore
+ \pst@number\pslinewidth setlinewidth
+ stroke
+ end
+ }%
+ \end@ClosedObj
+}
+%
+
\catcode`\@=\TheAtCode\relax
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/pst-text/pst-char.sty b/Master/texmf-dist/tex/latex/pst-text/pst-char.sty
index 01ee5fa215d..9e2bda63c3e 100644
--- a/Master/texmf-dist/tex/latex/pst-text/pst-char.sty
+++ b/Master/texmf-dist/tex/latex/pst-text/pst-char.sty
@@ -1,5 +1,5 @@
%%
-%% pst-grad.sty Copyright (C) 2008-- Herbert Voss <voss@pstricks.de>
+%% pst-char.sty Copyright (C) 2008-- Herbert Voss <voss@pstricks.de>
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pst-char}
diff --git a/Master/texmf-dist/tex/latex/pst-text/pst-text.sty b/Master/texmf-dist/tex/latex/pst-text/pst-text.sty
index fed1eb8c59d..58918c668fd 100644
--- a/Master/texmf-dist/tex/latex/pst-text/pst-text.sty
+++ b/Master/texmf-dist/tex/latex/pst-text/pst-text.sty
@@ -1,7 +1,11 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-text}[2006/01/01 package wrapper for pst-text.tex (hv)]
+\ProvidesPackage{pst-text}[2018/12/28 package wrapper for pst-text.tex (hv)]
\input{pst-text.tex}
\ProvidesFile{pst-text.tex}
[\filedate\space \fileversion\space `pst-text' (tvz)]
-\IfFileExists{pst-text.pro}{\@addtofilelist{pst-text.pro}}{}%
+\IfFileExists{pst-text.pro}{%
+ \ProvidesFile{pst-text.pro}[2018/12/28 v. 1.02, PostScript prologue file]
+ \@addtofilelist{pst-text.pro}}{}%
\endinput
+
+%% $Id: pst-text.sty 891 2018-12-29 19:42:20Z herbert $