diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-04 21:39:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-04 21:39:47 +0000 |
commit | bf12dd1f8724f65d1116fbfb6d9a94cfb49c88ac (patch) | |
tree | 883e981258ff8dc56a4c57dfdd554ad534f771b0 /Master | |
parent | 371ddd4c16bf1b16d9bd81caf9525e53128d3087 (diff) |
pst-calculate (4feb18)
git-svn-id: svn://tug.org/texlive/trunk@46544 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-calculate/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-calculate/README.md | 12 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.bib | 15 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.pdf | bin | 0 -> 42328 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.tex | 109 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pst-calculate/pst-calculate.sty | 57 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/pst-calculate.tlpsrc | 0 |
10 files changed, 197 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-calculate/Changes b/Master/texmf-dist/doc/generic/pst-calculate/Changes new file mode 100644 index 00000000000..a41bae3d58d --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-calculate/Changes @@ -0,0 +1 @@ +0.01 2018-02-04 - first CTAN version diff --git a/Master/texmf-dist/doc/generic/pst-calculate/README.md b/Master/texmf-dist/doc/generic/pst-calculate/README.md new file mode 100644 index 00000000000..49f16b979a2 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-calculate/README.md @@ -0,0 +1,12 @@ +# README # +Package pst-calculate defines two macros +which uses the capabilities +from LaTeX3 for calculating the values of +functions. It works only for LaTeX and not +for real TeX documents. + +%% This file is distributed under the terms of the LaTeX Project Public +%% License from CTAN archives in directory macros/latex/base/lppl.txt. +%% Either version 1.3 or, at your option, any later version. + +Herbert Voß
\ No newline at end of file diff --git a/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.bib b/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.bib new file mode 100644 index 00000000000..0913bdbd246 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.bib @@ -0,0 +1,15 @@ +@ctan{l3, +author = {{The \LaTeX3\ project}}, + title = {The \texttt{expl3} package and \LaTeX3\ programming}, + date = {2017-12-16}, + urldate = {2018-02-04}, + url = {/latex/macros/contrib/l3kernel/expl3.pdf} +} +@ctan{xfp, +author = {{The \LaTeX3\ project}}, +title = {The \texttt{xfp} package -- Floating Point Unit}, +Organisation = {CTAN}, +url = {/pkg/xfp}, + urldate = {2018-02-04}, +} + diff --git a/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.pdf b/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.pdf Binary files differnew file mode 100644 index 00000000000..7edf23e0edc --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.tex b/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.tex new file mode 100644 index 00000000000..bf497f88783 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-calculate/pst-calculate-doc.tex @@ -0,0 +1,109 @@ +%% $Id: pst-calculate-doc.tex 724 2018-02-04 13:01:03Z herbert $ +% +\listfiles +\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} + +\usepackage{graphicx} +\usepackage{multido} +\usepackage{libertine} +\usepackage[scaled=0.88]{beramono} +\usepackage{pst-calculate} % support opentype spark fonts +\makeatletter +\let\Version\pstcalculate@version +\makeatother + +\usepackage{showexpl,xltabular,booktabs,xurl,xcolor,ragged2e} +\lstset{% + language=[LaTeX]TeX,% + float=hbp,% + basicstyle=\ttfamily\small, % + keywordstyle=\bfseries, % + columns=flexible, % + tabsize=4, % +% frame=single, % + extendedchars=true, % + showspaces=false, % + showstringspaces=false, % +% numbers=left, +% numbersep=0.8em, +% numberstyle=\tiny, % + breaklines=true, % + breakautoindent=true, + captionpos=b, + xleftmargin=1em +} + +\usepackage[style=dtk]{biblatex} +\addbibresource{\jobname.bib} + +\usepackage{dtk-logos} % for Wikipedia W + +\pagestyle{headings} + +\usepackage[colorlinks,hyperfootnotes=false]{hyperref} +% define \code for url-like breaking of typewriter fragments. +\ifx\nolinkurl\undefined \let\code\url \else \let\code\nolinkurl \fi + +% Define \cs to prepend a backslash, and be unbreakable: +\DeclareRobustCommand\cs[1]{\mbox{\texttt{\char`\\#1}}} + + +\title{Support for floating point operations on \LaTeX-Level \\--\\ v.~\Version} +\author{Herbert Voß} +\begin{document} +\maketitle +\tableofcontents + +\section{Introduction} + +The upcoming \LaTeX3 can already be used. It is more or less stable and +macros will change only if really needed. + + +\section{Package options} +The package knows two optional arguments which, of course, have a corresponding +name in package \texttt{siunitx}. One can also use that one. + +\begin{tabularx}{\linewidth}{@{}llX@{}}\toprule +\emph{name} & \emph{\texttt{siunitx}} & \emph{description}\\\midrule +\texttt{useComma} & \texttt{output-decimal-marker=\{,\}} & Output always a comma instead of the default dot.\\ +\texttt{roundDigit}& \texttt{round-mode=places,round-precision=<value>} & round the given digit number.\\ +\bottomrule +\end{tabularx} + +\section{Using the macros} + +\begin{LTXexample}[pos=t] +\psCalculate{3.14126*314^2}\\ % Uses \num from siunitx +\pscalculate{3.14126*314^2} % doesn't use \num +\end{LTXexample} + +Without using any additional argument all available digits are printed. + +\section{Optional arguments} + +All optional arguments of package \texttt{siunitx} can be used: + +\begin{LTXexample}[pos=t] +\psCalculate[group-digits=false]{3.14126*314^2}\\ +\psCalculate[output-decimal-marker={,}]{3.14126*314^2/sin(3)}\\ +\psCalculate[exponent-product=\cdot,scientific-notation=true]{3.14126*314^2/sin(3)}\\ +\psCalculate[scientific-notation=engineering]{3.14126*314^2/sin(3)}\\ +\psCalculate[fixed-exponent=2,scientific-notation=fixed]{3.14126*314^2/sin(3)}\\ +\psCalculate[round-precision=3]{3.14126*314^2/sin(3)}\\ +\psCalculate[round-mode=places,round-precision=3]{3.14126*314^2/sin(3)} +\end{LTXexample} + +For more optional argument to format the output have a look at the documentation of \texttt{siunitx}. + + +\RaggedRight +\nocite{*} +\printbibliography + + +\end{document} + +y
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/pst-calculate/pst-calculate.sty b/Master/texmf-dist/tex/latex/pst-calculate/pst-calculate.sty new file mode 100644 index 00000000000..de95bfda10b --- /dev/null +++ b/Master/texmf-dist/tex/latex/pst-calculate/pst-calculate.sty @@ -0,0 +1,57 @@ +%% $Id: pst-calculate.sty 723 2018-02-04 12:45:52Z herbert $ +%% +%% This file is distributed under the terms of the LaTeX Project Public +%% License from CTAN archives in directory macros/latex/base/lppl.txt. +%% Either version 1.3 or, at your option, any later version. +%% +% Copyright 2018 Herbert Voss hvoss@tug.org +%% +\def\pstcalculate@version{0.01} +\ProvidesPackage{pst-calculate}[% + 2018/02/04 v. \pstcalculate@version~(Herbert Voss) Support for + caculations with floating point numbers.] +% +\RequirePackage{xkeyval} + +\newif\ifcalc@useComma \calc@useCommafalse +\DeclareOptionX{useComma}[true]{\@nameuse{calc@useComma#1}} +% +\let\calc@roundDigit\relax +\DeclareOptionX{roundDigit}{\def\calc@roundDigit{#1}} + +\DeclareOptionX*{\PassOptionsToPackage\CurrentOption{siunitx}} + +\ProcessOptionsX\relax + +\RequirePackage{xparse,siunitx} + +\ifx\relax\calc@roundDigit \else + \sisetup{round-mode=places,round-precision=\calc@roundDigit}% +\fi +\ifcalc@useComma + \sisetup{output-decimal-marker={,}} +\fi + +\ExplSyntaxOn +\DeclareExpandableDocumentCommand\ps@Calculate{m}{\fp_to_decimal:n{#1}}% +%\DeclareExpandableDocumentCommand\ps@@Calculate{m}{\fp_to_int:n{#1}}% +%\DeclareExpandableDocumentCommand\ps@@@Calculate{m}{\fp_to_scientific:n{#1}}% +\ExplSyntaxOff + +\def\pst@calculateType{0} + +\def\psCalculate{\@ifnextchar[\psCalculate@i{\psCalculate@i[]}} + +\def\psCalculate@i[#1]#2{% + \begingroup + \ifx\relax#1\relax\else\sisetup{#1}\fi + \num{\ps@Calculate{#2}} + \endgroup + \ignorespaces +} + +\let\pscalculate\ps@Calculate + +%% +\endinput + diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 31a2e418c65..308f780b275 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -508,7 +508,7 @@ my @TLP_working = qw( psgo psizzl pslatex psnfss pspicture pst-2dplot pst-3d pst-3dplot pst-abspos pst-am pst-arrow pst-asr pst-bar pst-barcode pst-bezier pst-blur pst-bspline - pst-calendar pst-cie pst-circ pst-coil pst-cox + pst-calculate pst-calendar pst-cie pst-circ pst-coil pst-cox pst-dart pst-dbicons pst-diffraction pst-electricfield pst-eps pst-eucl pst-eucl-translation-bg pst-exa pst-fill pst-fit pst-fr3d pst-fractal pst-fun pst-func diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 569655f5703..3036ff6de8d 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -902,6 +902,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'pst-bezier', "&MAKEpst", 'pst-blur', "&MAKEpst", 'pst-bspline', "&MAKEpst", + 'pst-calculate', "&MAKEpst", 'pst-cie', "&MAKEpst", 'pst-circ', "&MAKEpst", 'pst-coil', "&MAKEpst", diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc index fb8c0a3d823..43d719f8e08 100644 --- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc @@ -25,6 +25,7 @@ depend pst-barcode depend pst-bezier depend pst-blur depend pst-bspline +depend pst-calculate depend pst-calendar depend pst-cie depend pst-circ diff --git a/Master/tlpkg/tlpsrc/pst-calculate.tlpsrc b/Master/tlpkg/tlpsrc/pst-calculate.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/pst-calculate.tlpsrc |