diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-pulley/Changes | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-pulley/README | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-pulley/README.md | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.pdf | bin | 265182 -> 166447 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.tex | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/pst-pulley/Makefile | 71 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex | 88 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty | 3 |
8 files changed, 65 insertions, 128 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-pulley/Changes b/Master/texmf-dist/doc/generic/pst-pulley/Changes index 2306a7563c1..17119b41f5c 100644 --- a/Master/texmf-dist/doc/generic/pst-pulley/Changes +++ b/Master/texmf-dist/doc/generic/pst-pulley/Changes @@ -1,7 +1,7 @@ pst-pulley.sty -------- pst-pulley.tex -------- -v 0.01 2012/01/17 first version - +v 0.02 2017/09/16 +-grid in pulleyGrid pst-pulley-doc.tex -------- diff --git a/Master/texmf-dist/doc/generic/pst-pulley/README b/Master/texmf-dist/doc/generic/pst-pulley/README deleted file mode 100644 index 5b29e1ced19..00000000000 --- a/Master/texmf-dist/doc/generic/pst-pulley/README +++ /dev/null @@ -1,11 +0,0 @@ -pst-eps: exporting eps figures - -pst-eps.sty - The LaTeX file -pst-eps.tex - The TeX file -pst-eps-doc.pdf - The documentation -pst-eps-doc.tex - The documentation source -pst-eps-doc.bib - The documentation bib - - --- -Herbert Voss 2006-11-05 diff --git a/Master/texmf-dist/doc/generic/pst-pulley/README.md b/Master/texmf-dist/doc/generic/pst-pulley/README.md new file mode 100644 index 00000000000..df1ae945005 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-pulley/README.md @@ -0,0 +1,10 @@ +The pst-pulley package Author: T. Söll + +Dated: 2017/09/16 Version 0.02 + +pst-pulley contains the following: + +1) pst-pulley.sty +2) pst-pulley.tex + +T. Söll diff --git a/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.pdf b/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.pdf Binary files differindex 0569122058a..d18e87d8a62 100644 --- a/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.tex b/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.tex index 47677049166..379711320b1 100644 --- a/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-pulley/pst-pulley-doc.tex @@ -52,11 +52,11 @@ With this package it is possible to draw different pulleys. There are four param \section{Examples} -\begin{center}\xLcs{pspulleys}\xLkeyword{grid}\xLkeyword{N}\xLkeyword{M}\xLkeyword{h} -\pspulleys[grid,N=1,M=60,h=35] +\begin{center}\xLcs{pspulleys}\xLkeyword{pulleyGrid}\xLkeyword{N}\xLkeyword{M}\xLkeyword{h} +\pspulleys[pulleyGrid,N=1,M=60,h=35] \vspace{1.5cm} -\Lcs{pspulleys}[grid,N=1,M=60,h=35] +\Lcs{pspulleys}[pulleyGrid,N=1,M=60,h=35] \end{center} \begin{center} diff --git a/Master/texmf-dist/source/generic/pst-pulley/Makefile b/Master/texmf-dist/source/generic/pst-pulley/Makefile deleted file mode 100644 index 9f3e0ba4ad2..00000000000 --- a/Master/texmf-dist/source/generic/pst-pulley/Makefile +++ /dev/null @@ -1,71 +0,0 @@ - -# `Makefile' for `pst-coil.pdf', hv, 2006/08/11 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = pst-pulley - -MAIN = pst-pulley-doc - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -TDS = ~/PSTricks/PSTricks-TDS - -all : doc clean -# clean -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps - GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< - if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi - if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi - makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ - $(basename $<).glo - makeindex -t $(basename $<).ilg -o $(basename $<).ind \ - $(basename $<).idx - bibtex $(basename $<) - $(LATEX) $< - $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .bbl .blg) - $(RM) $(addprefix $(MAIN), .dvi .ps) - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: - cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/ - cp -u README $(TDS)/doc/generic/$(PACKAGE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ - cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ -# -# cp -u Changes $(TDS)/dvips/$(PACKAGE)/ -# cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ -# - cp -u Changes $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ - cp -u Makefile $(TDS)/source/$(PACKAGE)/ - - -# EOF diff --git a/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex b/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex index 7b509772a63..f1f6d18d364 100644 --- a/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex +++ b/Master/texmf-dist/tex/generic/pst-pulley/pst-pulley.tex @@ -1,17 +1,25 @@ -%% COPYRIGHT 2011 by Thomas Söll -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2003/12/01 or later. -% -% This work consists of the file pstricks.tex, PostScript macros -% for Generic TeX. -% See the PSTricks User's Guide for description. -% +%% +%% This is file `pst-pulley.tex', +%% +%% IMPORTANT NOTICE: +%% +%% Package `pst-pulley.tex' +%% +%% Thomas Söll +%% with the collaboration of +%% Herbert Voß +%% Manuel Luque +%% +%% This program can redistributed and/or modified under %% +%% the terms of the LaTeX Project Public License %% +%% Distributed from CTAN archives in directory %% +%% macros/latex/base/lppl.txt; either version 1.3 of %% +%% the License, or (at your option) any later version. %% +%% +%% DESCRIPTION: +%% `pst-pulley' is a PSTricks package +%% +%% \csname PSTpulleyLoaded\endcsname \let\PSTpulleyLoaded\endinput \ifx\GradientLoaded\endinput \else\input pst-grad \fi @@ -19,20 +27,20 @@ \ifx\PSTEuclideLoaded\endinput \else\input pst-eucl \fi \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add \fi % -\def\fileversion{0.01} -\def\filedate{2012/01/17} +\def\fileversion{0.02} +\def\filedate{2017/09/16} \message{ v\fileversion, \filedate (ts)} \message{ v\fileversion, \filedate} \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 \pst@addfams{pst-pulleys} -\define@boolkey[psset]{pst-pulleys}[Pst@]{grid}[true]{} % show grid +\define@boolkey[psset]{pst-pulleys}[Pst@]{pulleyGrid}[true]{} % show grid \define@key[psset]{pst-pulleys}{N}{\def\psk@pulleys@N{#1}} % nombre de poulies \define@key[psset]{pst-pulleys}{M}{\def\psk@pulleys@M{#1}} % charge en kg \define@key[psset]{pst-pulleys}{h}{\def\psk@pulleys@S{#1}} % déplacement du point d'action en cm % \define@key[psset]{pst-pulleys}{Dx}{\def\psk@pulleys@DX{#1}} % placement of the down-part % -\psset[pst-pulleys]{N=1,M=20,h=15,Dx=0,grid=false} +\psset[pst-pulleys]{N=1,M=20,h=15,Dx=0,pulleyGrid=false} % \newpsstyle{pulley}{linewidth=0.7pt,fillstyle=radslope,slopeangle=70,slopeend=black!70,slopebegin=gray!30,dimen=outer} \newpsstyle{pulley-frame}{linewidth=1.0pt,framearc=.15,fillstyle=gradient,gradangle=0,gradend=cyan!30,gradbegin=black!70} @@ -1200,30 +1208,30 @@ \def\pst@@CommaVal#1.#2.#3\@nil{\ifx\relax#2\relax#1\else\pst@@@CommaVal#1.#2\@nil\fi} \def\pst@@@CommaVal#1.#2#3\@nil{#1{,}#2} % +%$ % -% +\newcount\Npulleys \def\pspulleys{\pst@object{pspulleys}} \def\pspulleys@i{% -\begingroup% -\pst@killglue -\use@par -\pstFPmul\ps@Seil{\psk@pulleys@S}{\psk@pulleys@N} -\pstFPdiv\ps@ForceS{\psk@pulleys@M}{\psk@pulleys@N} -\pstFPMul\ps@ForceS{10}{\ps@ForceS} -\pstFPMul\ps@ForceG{\psk@pulleys@M}{10} -\pstFPdiv\ps@HightH{\psk@pulleys@S}{10} -\pstFPsub\ps@HightH{\ps@HightH}{3} -\pstFPmul\ps@SeilEnd{\psk@pulleys@S}{\psk@pulleys@N} -\pstFPdiv\ps@SeilEnd{\ps@SeilEnd}{10} -\pstFPadd\ps@SeilEndH{\ps@SeilEnd}{3.37} -\pstFPadd\ps@SeilEnd{\ps@SeilEnd}{3} - -% -\newcount\Npulleys -\Npulleys=\psk@pulleys@N -\advance\Npulleys by -1 -\ifPst@grid\pspicture[showgrid](-4,-11.5)(4,7)\else\pspicture(-4,-11.5)(4,7)\fi% -\ifcase\Npulleys + \begingroup + \pst@killglue + \use@par + \pstFPmul\ps@Seil{\psk@pulleys@S}{\psk@pulleys@N} + \pstFPdiv\ps@ForceS{\psk@pulleys@M}{\psk@pulleys@N} + \pstFPMul\ps@ForceS{10}{\ps@ForceS} + \pstFPMul\ps@ForceG{\psk@pulleys@M}{10} + \pstFPdiv\ps@HightH{\psk@pulleys@S}{10} + \pstFPsub\ps@HightH{\ps@HightH}{3} + \pstFPmul\ps@SeilEnd{\psk@pulleys@S}{\psk@pulleys@N} + \pstFPdiv\ps@SeilEnd{\ps@SeilEnd}{10} + \pstFPadd\ps@SeilEndH{\ps@SeilEnd}{3.37} + \pstFPadd\ps@SeilEnd{\ps@SeilEnd}{3} +% + \Npulleys=\psk@pulleys@N + \advance\Npulleys by -1 + \pspicture(-4,-11.5)(4,7) + \ifPst@pulleyGrid\psgrid[style=gridstyle]\fi + \ifcase\Npulleys % 1 poulie \poulieA \or @@ -1246,7 +1254,7 @@ \poulieD \fi \endpspicture -\endgroup% +\endgroup \ignorespaces} \catcode`\@=\TheAtCode\relax diff --git a/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty b/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty index c7df2fcbd0b..a609731966f 100644 --- a/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty +++ b/Master/texmf-dist/tex/latex/pst-pulley/pst-pulley.sty @@ -1,5 +1,6 @@ +\PassOptionsToPackage{dvipsnames}{pstricks} \RequirePackage{pstricks} -\ProvidesPackage{pst-pulley}[2012/01/17 package wrapper for PSTricks pst-pulley.tex] +\ProvidesPackage{pst-pulley}[2017/09/16 package wrapper for PSTricks pst-pulley.tex] \input{pst-pulley.tex} \ProvidesFile{pst-pulley.tex} [\filedate\space v\fileversion\space `PST-pulley' (ts)] |