From f773331df58a7fd5a9e45fcb04799793085e41dd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Mar 2014 21:28:33 +0000 Subject: fifo-stack (25mar14) git-svn-id: svn://tug.org/texlive/trunk@33288 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fifo-stack/README | 77 ++ .../doc/latex/fifo-stack/fifo-stack-test.tex | 267 ++++++ .../texmf-dist/doc/latex/fifo-stack/fifo-stack.cwl | 48 ++ .../texmf-dist/doc/latex/fifo-stack/fifo-stack.pdf | Bin 0 -> 247557 bytes .../source/latex/fifo-stack/fifo-stack.dtx | 957 +++++++++++++++++++++ .../source/latex/fifo-stack/fifo-stack.ins | 45 + .../texmf-dist/tex/latex/fifo-stack/fifo-stack.sty | 210 +++++ Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 + Master/tlpkg/tlpsrc/fifo-stack.tlpsrc | 0 10 files changed, 1606 insertions(+), 1 deletion(-) create mode 100644 Master/texmf-dist/doc/latex/fifo-stack/README create mode 100644 Master/texmf-dist/doc/latex/fifo-stack/fifo-stack-test.tex create mode 100644 Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.cwl create mode 100644 Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.pdf create mode 100644 Master/texmf-dist/source/latex/fifo-stack/fifo-stack.dtx create mode 100644 Master/texmf-dist/source/latex/fifo-stack/fifo-stack.ins create mode 100644 Master/texmf-dist/tex/latex/fifo-stack/fifo-stack.sty create mode 100644 Master/tlpkg/tlpsrc/fifo-stack.tlpsrc (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/fifo-stack/README b/Master/texmf-dist/doc/latex/fifo-stack/README new file mode 100644 index 00000000000..66f085fc107 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fifo-stack/README @@ -0,0 +1,77 @@ +# latexFifoStack + +A LaTeX implementation of a combined FIFO Stack modified from Benjamin +Bayart's excellent [LaTeX stack +package](http://www.ctan.org/tex-archive/macros/latex2e/contrib/stack) +from [CTAN](http://www.ctan.org). + +As well as keeping Bayart's \Push and \Pop commands (which have been +renamed to \FSPush and \FSPop and which work on the top/end of the +FIFO/Stack), we explicitly add the ability to \FSUnshift \FSShift off +the bottom/front of the FIFO/Stack + +# Source code + +The original source code [public +releases](https://github.com/diSimplex/latexFifoStack) and the +[development code](https://github.com/stephengaito/latexFifoStack) can +both be found on GitHub. + +# Building + +This project can most easily be built using the "cook" rubygem and the +command line command: + +> cook texStyle + +in the project's root directory. This will compile the documentation, +run the regression tests and zip the CTAN package into the directory +ctanRepo directory. + +# Copyright and LaTeX Project Public License + +Copyright (C) 2014 Stephen Gaito (PerceptiSys Ltd) + +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 2005/12/01 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Stephen Gaito. + +The released source can be found at: +https://github.com/diSimplex/latexFifoStack/tree/master/texStyle + +The development source can be found at: +https://github.com/stephengaito/latexFifoStack/tree/master/texStyle + +This work consists of the files fifo-stack.dtx, and fifo-stack.ins. + +The command: + +> pdflatex fifo-stack.ins + +followed by: + +> pdflatex fifo-stack.dtx + +will produce the derived files: fifo-stack.sty, fifo-stack-test.tex, +and fifo-stack.pdf. + +The command: + +> pdflatex fifo-stack-test.tex + +will regression test the fifo-stack package. Output will be found in +fifo-stack-test.lgout. If pdflatex completes with no errors, then all +regression tests passed. + +# What's new + +v1.0 (2014/03/24) +* Initial version extened from CTAN stack package v1.00 (on 2014/03/24) diff --git a/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack-test.tex b/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack-test.tex new file mode 100644 index 00000000000..c8179eecd8a --- /dev/null +++ b/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack-test.tex @@ -0,0 +1,267 @@ +%% +%% This is file `fifo-stack-test.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fifo-stack.dtx (with options: `qstest') +%% +%% Copyright (C) 2014 Stephen Gaito (PerceptiSys Ltd) +%% +%% 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 +%% 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Stephen Gaito. +%% +%% The released source can be found at: +%% https://github.com/diSimplex/latexFifoStack/tree/master/texStyle +%% +%% The development source can be found at: +%% https://github.com/stephengaito/latexFifoStack/tree/master/texStyle +%% +%% This work consists of the files fifo-stack.dtx, and fifo-stack.ins. +%% +%% The command: +%% pdflatex fifo-stack.ins +%% followed by: +%% pdflatex fifo-stack.dtx +%% will produce the derived files: fifo-stack.sty, fifo-stack-test.tex, +%% and fifo-stack.pdf. +%% +%% The command: +%% pdflatex fifo-stack-test.tex +%% will regression test the fifo-stack package. Output will be found in +%% fifo-stack-test.lgout. If pdflatex completes with no errors, then all +%% regression tests passed. +%% +\RequirePackage{qstest} +\RequirePackage{xifthen} +\IncludeTests{*} +\LogTests{lgout}{*}{*} +\RequirePackage{fifo-stack} +\begin{qstest}{Simple stack integration test} + {\FSCreate, \FSPush, \FSPop, \FSTop} + + \FSCreate{testStack}{defaultValue} + \Expect*{\FSTop{testStack}}{defaultValue} + \FSPush{testStack}{firstValue} + \Expect*{\FSTop{testStack}}{firstValue} + \FSPush{testStack}{secondValue} + \Expect*{\FSTop{testStack}}{secondValue} + \FSPush{testStack}{thirdValue} + \Expect*{\FSTop{testStack}}{thirdValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{secondValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{firstValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{defaultValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{defaultValue} +\end{qstest} +\begin{qstest}{Up down up down stack integration test} + {\FSCreate, \FSPush, \FSPop, \FSTop} + + \FSCreate{testStackUDUD}{defaultValue} + \Expect*{\FSTop{testStackUDUD}}{defaultValue} + \FSPush{testStackUDUD}{firstValue} + \Expect*{\FSTop{testStackUDUD}}{firstValue} + \FSPush{testStackUDUD}{secondValue} + \Expect*{\FSTop{testStackUDUD}}{secondValue} + \FSPop{testStackUDUD} + \Expect*{\FSTop{testStackUDUD}}{firstValue} + \FSPush{testStackUDUD}{newSecondValue} + \Expect*{\FSTop{testStackUDUD}}{newSecondValue} +\end{qstest} +\begin{qstest}{Simple FIFO integration test} + {\FSCreate, \FSPush, \FSShift, \FSTop, \FSBottom} + + \FSCreate{testFifo}{defaultValue} + \Expect*{\FSTop{testFifo}}{defaultValue} + \Expect*{\FSBottom{testFifo}}{defaultValue} + \FSPush{testFifo}{firstValue} + \Expect*{\FSTop{testFifo}}{firstValue} + \Expect*{\FSBottom{testFifo}}{firstValue} + \FSPush{testFifo}{secondValue} + \Expect*{\FSTop{testFifo}}{secondValue} + \Expect*{\FSBottom{testFifo}}{firstValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{secondValue} + \Expect*{\FSBottom{testFifo}}{secondValue} + \FSPush{testFifo}{thirdValue} + \Expect*{\FSTop{testFifo}}{thirdValue} + \Expect*{\FSBottom{testFifo}}{secondValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{thirdValue} + \Expect*{\FSBottom{testFifo}}{thirdValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{defaultValue} + \Expect*{\FSBottom{testFifo}}{defaultValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{defaultValue} + \Expect*{\FSBottom{testFifo}}{defaultValue} +\end{qstest} +\begin{qstest}{Simple linear use of unshift/shift} + {\FSUnshift, \FSShift} + + \FSCreate{testRStack}{defaultValue} + \Expect*{\FSBottom{testRStack}}{defaultValue} + \FSUnshift{testRStack}{firstValue} + \Expect*{\FSBottom{testRStack}}{firstValue} + \FSUnshift{testRStack}{secondValue} + \Expect*{\FSBottom{testRStack}}{secondValue} + \FSUnshift{testRStack}{thirdValue} + \Expect*{\FSBottom{testRStack}}{thirdValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{secondValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{firstValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{defaultValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{defaultValue} +\end{qstest} +\begin{qstest}{Full non-linear FIFO/stack integration test} + {\FSCreate, \FSPush, \FSPop, \FSUnshift, \FSShift, \FSTop, \FSBottom} + + \FSCreate{testFS}{defaultValue} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} + \FSPush{testFS}{value1} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value1} + \FSUnshift{testFS}{value-1} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value-1} + \FSShift{testFS} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value1} + \FSPush{testFS}{value2} + \Expect*{\FSTop{testFS}}{value2} + \Expect*{\FSBottom{testFS}}{value1} + \FSUnshift{testFS}{value-1again} + \Expect*{\FSTop{testFS}}{value2} + \Expect*{\FSBottom{testFS}}{value-1again} + \FSUnshift{testFS}{value-2} + \Expect*{\FSTop{testFS}}{value2} + \Expect*{\FSBottom{testFS}}{value-2} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value-2} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{value-1again} + \Expect*{\FSBottom{testFS}}{value-2} + \FSShift{testFS} + \Expect*{\FSTop{testFS}}{value-1again} + \Expect*{\FSBottom{testFS}}{value-1again} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} + \FSShift{testFS} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} +\end{qstest} +\begin{qstest}{FSClear, FSSize, and FSDestroy test} + {\FSCreate, \FSPush, \FSPop, \FSUnshift, \FSShift, \FSTop, + \FSBottom, \FSClear, \FSDestroy, \FSSize} + + \FSCreate{testFSC}{defaultValue} + \Expect*{\FSSize{testFSC}}{0} + \Expect*{\FSTop{testFSC}}{defaultValue} + \Expect*{\FSBottom{testFSC}}{defaultValue} + \FSPush{testFSC}{value1} + \Expect*{\FSSize{testFSC}}{1} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value1} + \FSUnshift{testFSC}{value-1} + \Expect*{\FSSize{testFSC}}{2} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSPush{testFSC}{value2} + \Expect*{\FSSize{testFSC}}{3} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSUnshift{testFSC}{value-2} + \Expect*{\FSSize{testFSC}}{4} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-2} + \FSClear{testFSC} + \Expect*{\FSSize{testFSC}}{0} + \Expect*{\FSTop{testFSC}}{defaultValue} + \Expect*{\FSBottom{testFSC}}{defaultValue} + \FSPush{testFSC}{value1} + \Expect*{\FSSize{testFSC}}{1} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value1} + \FSUnshift{testFSC}{value-1} + \Expect*{\FSSize{testFSC}}{2} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSPush{testFSC}{value2} + \Expect*{\FSSize{testFSC}}{3} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSUnshift{testFSC}{value-2} + \Expect*{\FSSize{testFSC}}{4} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-2} + \FSDestroy{testFSC} +\end{qstest} +\begin{qstest}{Unit test of \fifo@stack@pointer}{\fifo@stack@pointer} + \makeatletter + \Expect*{\fifo@stack@pointer{1}}{ii} + \Expect*{\fifo@stack@pointer{0}}{i} + \Expect*{\fifo@stack@pointer{-1}}{@i} + \makeatother +\end{qstest} +\begin{qstest}{Unit test of \FSdestroy} + {\FSCreate, \FSDestroy} + + \FSCreate{testFSDestroy}{defaultValue} + \makeatletter + \ExpectIfThen{\isnamedefined{testFSDestroy@fifo@stack@count@top}} + \ExpectIfThen{\isnamedefined{testFSDestroy@fifo@stack@count@bottom}} + \ExpectIfThen{\isnamedefined{testFSDestroy@fifo@stack@count@size}} + \ExpectIfThen{\isnamedefined{fifo@stack@top@testFSDestroy}} + \ExpectIfThen{\isnamedefined{fifo@stack@bottom@testFSDestroy}} + \makeatother + \FSDestroy{testFSDestroy} + \makeatletter + \ExpectIfThen{\isundefined\testFSDestroy@fifo@stack@count@top} + \ExpectIfThen{\isundefined\testFSDestroy@fifo@stack@count@bottom} + \ExpectIfThen{\isundefined\testFSDestroy@fifo@stack@count@size} + \ExpectIfThen{\isundefined\fifo@stack@top@testFSDestroy} + \ExpectIfThen{\isundefined\fifo@stack@bottom@testFSDestroy} + \makeatother +\end{qstest} +\begin{qstest}{Unit test of \FSPush and \FSTop} + {\FSCreate, \FSPush, \FSTop} + + \FSCreate{testFSPush}{defaultValue} + \Expect*{\FSTop{testFSPush}}{defaultValue} + \FSPush{testFSPush}{\FSTop{testFSPush}-with-additional-text} + \Expect*{\FSTop{testFSPush}}{defaultValue-with-additional-text} +\end{qstest} +\begin{qstest}{Unit test of \FSUnshift and \FSBottom} + {\FSCreate, \FSUnshift, \FSBottom} + + \FSCreate{testFSUnshift}{defaultValue} + \Expect*{\FSBottom{testFSUnshift}}{defaultValue} + \FSUnshift{testFSUnshift}{\FSBottom{testFSUnshift}-with-additional-text} + \Expect*{\FSBottom{testFSUnshift}}{defaultValue-with-additional-text} +\end{qstest} +\LogClose{lgout} +\stop +\endinput +%% +%% End of file `fifo-stack-test.tex'. diff --git a/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.cwl b/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.cwl new file mode 100644 index 00000000000..524cdc5c806 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.cwl @@ -0,0 +1,48 @@ +# +# Copyright (C) 2014 Stephen Gaito (PerceptiSys Ltd) +# +# 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 2005/12/01 or later. +# +# This work has the LPPL maintenance status `maintained'. +# +# The Current Maintainer of this work is Stephen Gaito. +# +# The released source can be found at: +# https://github.com/diSimplex/latexFifoStack/tree/master/texStyle +# +# The development source can be found at: +# https://github.com/stephengaito/latexFifoStack/tree/master/texStyle +# +# This work consists of the files fifo-stack.dtx, and fifo-stack.ins. +# +# The command: +# pdflatex fifo-stack.ins +# followed by: +# pdflatex fifo-stack.dtx +# will produce the derived files: fifo-stack.sty, fifo-stack-test.tex, +# and fifo-stack.pdf. +# +# The command: +# pdflatex fifo-stack-test.tex +# will regression test the fifo-stack package. Output will be found in +# fifo-stack-test.lgout. If pdflatex completes with no errors, then all +# regression tests passed. +# +\FSCreate{fifoStackName}{defaultValue}# +\FSClear{fifoStackName}# +\FSDestroy{fifoStackName}# +\FSTop{fifoStackName}# +\FSPush{fifoStackName}{value}# +\FSPop{fifoStackName}# +\FSShowTop{fifoStackName}# +\FSBottom{fifoStackName}# +\FSUnshift{fifoStackName}{value}# +\FSShift{fifoStackName}# +\FSShowBottom{fifoStackName}# +\FSSize{fifoStackName}# diff --git a/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.pdf b/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.pdf new file mode 100644 index 00000000000..f78a764d75b Binary files /dev/null and b/Master/texmf-dist/doc/latex/fifo-stack/fifo-stack.pdf differ diff --git a/Master/texmf-dist/source/latex/fifo-stack/fifo-stack.dtx b/Master/texmf-dist/source/latex/fifo-stack/fifo-stack.dtx new file mode 100644 index 00000000000..e4d35660e00 --- /dev/null +++ b/Master/texmf-dist/source/latex/fifo-stack/fifo-stack.dtx @@ -0,0 +1,957 @@ +% \changes{1.0}{2014/03/24}{Initial version} +% +% \iffalse +%<*never> +\documentclass{ltxdoc} +\usepackage{fifo-stack} +\usepackage{hyperref} +\GetFileInfo{fifo-stack.sty} +\CodelineIndex +\EnableCrossrefs +\RecordChanges +\begin{document} +\CheckSum{12} +\DocInput{fifo-stack.dtx} +\section{Copyright and \LaTeX\ Project Public License} +\begin{verbatim} +%txsBeginComment + +Copyright (C) 2014 Stephen Gaito (PerceptiSys Ltd) + +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 2005/12/01 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Stephen Gaito. + +The released source can be found at: +https://github.com/diSimplex/latexFifoStack/tree/master/texStyle + +The development source can be found at: +https://github.com/stephengaito/latexFifoStack/tree/master/texStyle + +This work consists of the files fifo-stack.dtx, and fifo-stack.ins. + +The command: + pdflatex fifo-stack.ins +followed by: + pdflatex fifo-stack.dtx +will produce the derived files: fifo-stack.sty, fifo-stack-test.tex, +and fifo-stack.pdf. + +The command: + pdflatex fifo-stack-test.tex +will regression test the fifo-stack package. Output will be found in +fifo-stack-test.lgout. If pdflatex completes with no errors, then all +regression tests passed. + +%txsEndComment +\end{verbatim} +\PrintIndex +\PrintChanges +\end{document} +% +% \fi +% +% \DoNotIndex{\edef,\advance,\else,\csname,\endcsname,\expandafter} +% \DoNotIndex{\ifx,\fi,\input,\ifnum,\relax,\newcount,\romannumeral} +% \DoNotIndex{\the,\typeout,\xdef,\global,\newcommand,\RequirePackage} +% \DoNotIndex{\PackageError,\ProvidesPackage,\gdef} +% \DoNotIndex{\IncludeTests,\LogClose,\LogTests,\Expect,\ExpectIfThen} +% \DoNotIndex{\isnamedefined,\isundefined} +% \DoNotIndex{\stop,\makeatletter,\makeatother,\begin,\end,\def,\let} +% \DoNotIndex{\testFSDestroy@fifo@stack@count@top} +% \DoNotIndex{\testFSDestroy@fifo@stack@count@bottom} +% \DoNotIndex{\testFSDestroy@fifo@stack@count@size} +% \DoNotIndex{\fifo@stack@top@testFSDestroy} +% \DoNotIndex{\fifo@stack@bottom@testFSDestroy} +% +% \title{A \LaTeX\ FIFO/Stack implementation for Package writers} +% \author{Stephen \textsc{Gaito}} +% \date{\filedate} +% \maketitle +% \begin{abstract} +% This package provides a \LaTeX\ implementation of a FIFO/Stack system +% independent from the \TeX\ stack itself. It is based on Benjamin Bayart's +% excellent \href{http://www.ctan.org/pkg/stack}{stack} package from +% \href{http://www.ctan.org}{CTAN}. +% +% This package by itself is of no use to anyone other than macro-developers. +% +% Note that to simplify the computations, this package makes essential use of +% $\varepsilon$-\TeX's \verb|\numexpr| macro. Fortunately most modern \TeX, +% \LaTeX\ and pdf\LaTeX's are actually $\varepsilon$-\TeX. +% \end{abstract} +% \tableofcontents +% +% \section{Using the FIFO/stack package} +% +% All of the macros provided by this package are meant to be used by package +% developers (there is no meaningful use of a FIFO or stack in a final +% document, they will only to be used in a package), so, all of those macros +% have capital letters in their names, following old guidelines for \LaTeX3 +% project. +% +% To ensure these macros do not clash with other packages, the names of all +% macros begin with ``FS''. +% +% \subsection{FIFO/Stack creation and destruction commands} +% +% To create a new FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSCreate}\verb|\FSCreate{fifoStackName}{defaultValue}| +% \end{quote} +% This macro simply initializes all the required data for the FIFO/stack named by +% the value of the first argument, \verb|fifoStackName|. The second argument, +% \verb|defaultValue|, is the value of the top of the FIFO/stack whenever the +% FIFO/stack is empty. +% +% To clear an existing FIFO/stack of all of its current elements: +% \begin{quote} +% \DescribeMacro{\FSClear}\verb|\FSClear{fifoStackName}| +% \end{quote} +% This macro empties the FIFO/stack named \verb|fifoStackName|, but the +% FIFO/stack can still be used to \verb|\FSPush| or \verb|\FSUnshift| new +% elements. +% +% To destroy an existing FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSDestroy}\verb|\FSDestroy{fifoStackName}| +% \end{quote} +% This macro destroys the FIFO/stack named \verb|fifoStackName|. +% +% \subsection{Stack based commands} +% +% To push a new value on \emph{top} of a FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSPush}\verb|\FSPush{fifoStackName}{value}|\newline +% \end{quote} +% Note that you \emph{can} use \verb|\FSTop| in the \verb|value| argument of the +% \verb|\FSPush| macro. See the qstest unit test for \verb|\FSPush| (below) for +% an example. +% +% To remove the value from the \emph{top} of a FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSPop}\verb|\FSPop{fifoStackName}| +% \end{quote} +% +% To get the value from the \emph{top} of the FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSTop}\verb|\FSTop{fifoStackName}| +% \end{quote} +% +% For use when debugging your use of the FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSShowTop}\verb|\FSShowTop{fifoStackName}| +% \end{quote} +% will \verb|\typeout| the current value on the \emph{top} of the FIFO/stack. +% +% \subsection{FIFO based commands} +% +% To add a new value to the \emph{bottom} of a FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSUnshift}\verb|\FSUnshift{fifoStackName}{value}| +% \end{quote} +% Note that you \emph{can} use \verb|\FSBottom| in the \verb|value| argument of +% the \verb|\FSUnshift| macro. See the qstest unit test for \verb|\FSUnshift| +% (below) for an example. +% +% To remove the value on the \emph{bottom} of a FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSShift}\verb|\FSShift{fifoStackName}| +% \end{quote} +% +% To get the value on the \emph{bottom} of a FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSBottom}\verb|\FSBottom{fifoStackName}| +% \end{quote} +% +% For use when debugging your use of the FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSShowBottom}\verb|\FSShowBottom{fifoStackName}| +% \end{quote} +% will \verb|\typeout| the current value on the \emph{bottom} of the FIFO/stack. +% +% \subsection{FIFO/stack size commands} +% +% To get the current size of the FIFO/stack: +% \begin{quote} +% \DescribeMacro{\FSSize}\verb|\FSSize{fifoStackName}| +% \end{quote} +% +% \subsection{TeXStudio CWL file} +% +% As a bonus for users of TeXStudio, the \verb|fifo-stack.zip| file also +% contains a \verb|fifo-stack.cwl| file which provides TeXStudio command +% expansion descriptions for each of the `public' \verb|fifo-stack| macros. To +% make use of these command expansions, simply place the \verb|fifo-stack.cwl| +% file into TeXStudio's local configuration directory (on most Linux +% distributions this can be found in \verb|~/.config/texstudio|). +% +% This \verb|fifo-stack.cwl| file is automatically generated from the macrocode +% lines which begin with the characters \verb|%txs|. This automatic generation +% is done by the \verb|cook texStyle| command defined by the sister project +% \href{https://github.com/diSimplex/diSimplexLaTeX}{diSimplexLaTeX}'s (ruby) +% cookbook. +% +% \subsection{\TeX\ and \LaTeX\ Dependencies} +% +% The \verb|fifo-stack| package depends upon both $\varepsilon$-\TeX, as well as +% the \verb|ifthen| package. $\varepsilon$-\TeX\ is required only for the two +% uses of \verb|\numexpr|. The \verb|ifthen| package is only required for the +% one use of \verb|\whiledo|. All three uses are listed in the index. +% +% The production of this documentation assumes you have the \verb|hyperref| +% package installed. +% +% The regression tests associated with this package depend upon the +% \verb|qstest|, \verb|ifthen|, and \verb|xifthen| packages. +% +% \section{Integration tests and example usage} +% +% We use the \href{http://www.ctan.org/pkg/qstest}{QSTest} package from +% \href{http://www.ctan.org}{CTAN} to provide both integration and unit tests of +% our FIFO/stack package. +% +% In this section we walk through a number of integration tests which also +% provide example uses of FIFO/Stacks. We provide unit tests of specific +% invariants in the code section below. These unit tests are associated +% with the section of code which implements a particular invariant. +% +% We begin by setting up the \LaTeX\ QSTest package to test the \verb|fifo-stack| +% package, and we will log everything. Note that we do not use a document class +% or begin/end a document, this is because there should not be any \emph{normal} +% output created. All \emph{results} are listed in the associated +% \verb|fifo-stack-test.lgout| file. +% +% \begin{macrocode} +%<*qstest> +\RequirePackage{qstest} +\RequirePackage{xifthen} +\IncludeTests{*} +\LogTests{lgout}{*}{*} +\RequirePackage{fifo-stack} +% +% \end{macrocode} +% +% \subsection{Stack based examples} +% +% We now provide an example of standard use of just the stack based +% functionality. To do this we create a stack, push three things onto the stack +% and then pop all three things back off, all in a nice linear fashion. +% +% \begin{macrocode} +%<*qstest> +\begin{qstest}{Simple stack integration test} + {\FSCreate, \FSPush, \FSPop, \FSTop} + + \FSCreate{testStack}{defaultValue} + \Expect*{\FSTop{testStack}}{defaultValue} + \FSPush{testStack}{firstValue} + \Expect*{\FSTop{testStack}}{firstValue} + \FSPush{testStack}{secondValue} + \Expect*{\FSTop{testStack}}{secondValue} + \FSPush{testStack}{thirdValue} + \Expect*{\FSTop{testStack}}{thirdValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{secondValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{firstValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{defaultValue} + \FSPop{testStack} + \Expect*{\FSTop{testStack}}{defaultValue} +\end{qstest} +% +% \end{macrocode} +% +% We now look at using the stack in a non-linear order pushing, popping, then +% pushing and popping again. +% +% \begin{macrocode} +%<*qstest> +\begin{qstest}{Up down up down stack integration test} + {\FSCreate, \FSPush, \FSPop, \FSTop} + + \FSCreate{testStackUDUD}{defaultValue} + \Expect*{\FSTop{testStackUDUD}}{defaultValue} + \FSPush{testStackUDUD}{firstValue} + \Expect*{\FSTop{testStackUDUD}}{firstValue} + \FSPush{testStackUDUD}{secondValue} + \Expect*{\FSTop{testStackUDUD}}{secondValue} + \FSPop{testStackUDUD} + \Expect*{\FSTop{testStackUDUD}}{firstValue} + \FSPush{testStackUDUD}{newSecondValue} + \Expect*{\FSTop{testStackUDUD}}{newSecondValue} +\end{qstest} +% +% \end{macrocode} +% +% \subsection{FIFO/Stack based examples} +% +% This time we make use of \verb|\FSPush| to put items onto the FIFO and +% \verb|\FSShift| to take them off in a \emph{first in first off} order. At the +% end we shift past the top of the FIFO/Stack, and so we should get the default +% value again. +% +% \begin{macrocode} +%<*qstest> +\begin{qstest}{Simple FIFO integration test} + {\FSCreate, \FSPush, \FSShift, \FSTop, \FSBottom} + + \FSCreate{testFifo}{defaultValue} + \Expect*{\FSTop{testFifo}}{defaultValue} + \Expect*{\FSBottom{testFifo}}{defaultValue} + \FSPush{testFifo}{firstValue} + \Expect*{\FSTop{testFifo}}{firstValue} + \Expect*{\FSBottom{testFifo}}{firstValue} + \FSPush{testFifo}{secondValue} + \Expect*{\FSTop{testFifo}}{secondValue} + \Expect*{\FSBottom{testFifo}}{firstValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{secondValue} + \Expect*{\FSBottom{testFifo}}{secondValue} + \FSPush{testFifo}{thirdValue} + \Expect*{\FSTop{testFifo}}{thirdValue} + \Expect*{\FSBottom{testFifo}}{secondValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{thirdValue} + \Expect*{\FSBottom{testFifo}}{thirdValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{defaultValue} + \Expect*{\FSBottom{testFifo}}{defaultValue} + \FSShift{testFifo} + \Expect*{\FSTop{testFifo}}{defaultValue} + \Expect*{\FSBottom{testFifo}}{defaultValue} +\end{qstest} +% +% \end{macrocode} +% +% We now provide an example use of \verb|\FSUnshift| and \verb|\FSShift|. +% +% \begin{macrocode} +%<*qstest> +\begin{qstest}{Simple linear use of unshift/shift} + {\FSUnshift, \FSShift} + + \FSCreate{testRStack}{defaultValue} + \Expect*{\FSBottom{testRStack}}{defaultValue} + \FSUnshift{testRStack}{firstValue} + \Expect*{\FSBottom{testRStack}}{firstValue} + \FSUnshift{testRStack}{secondValue} + \Expect*{\FSBottom{testRStack}}{secondValue} + \FSUnshift{testRStack}{thirdValue} + \Expect*{\FSBottom{testRStack}}{thirdValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{secondValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{firstValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{defaultValue} + \FSShift{testRStack} + \Expect*{\FSBottom{testRStack}}{defaultValue} +\end{qstest} +% +% \end{macrocode} +% +% Now we provide an example (non-linear) use of all of the \verb|\FSPush|, +% \verb|\FSPop|, \verb|\FSUnshift|, and \verb|\FSShift| macros +% +% \begin{macrocode} +%<*qstest> +\begin{qstest}{Full non-linear FIFO/stack integration test} + {\FSCreate, \FSPush, \FSPop, \FSUnshift, \FSShift, \FSTop, \FSBottom} + + \FSCreate{testFS}{defaultValue} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} + \FSPush{testFS}{value1} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value1} + \FSUnshift{testFS}{value-1} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value-1} + \FSShift{testFS} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value1} + \FSPush{testFS}{value2} + \Expect*{\FSTop{testFS}}{value2} + \Expect*{\FSBottom{testFS}}{value1} + \FSUnshift{testFS}{value-1again} + \Expect*{\FSTop{testFS}}{value2} + \Expect*{\FSBottom{testFS}}{value-1again} + \FSUnshift{testFS}{value-2} + \Expect*{\FSTop{testFS}}{value2} + \Expect*{\FSBottom{testFS}}{value-2} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{value1} + \Expect*{\FSBottom{testFS}}{value-2} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{value-1again} + \Expect*{\FSBottom{testFS}}{value-2} + \FSShift{testFS} + \Expect*{\FSTop{testFS}}{value-1again} + \Expect*{\FSBottom{testFS}}{value-1again} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} + \FSPop{testFS} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} + \FSShift{testFS} + \Expect*{\FSTop{testFS}}{defaultValue} + \Expect*{\FSBottom{testFS}}{defaultValue} +\end{qstest} +% +% \end{macrocode} +% +% Finally we add an integration test of the full suite, including +% \verb|\FSClear|, \verb|\FSSize|, and \verb|\FSDestroy| macros +% +% \begin{macrocode} +%<*qstest> +\begin{qstest}{FSClear, FSSize, and FSDestroy test} + {\FSCreate, \FSPush, \FSPop, \FSUnshift, \FSShift, \FSTop, + \FSBottom, \FSClear, \FSDestroy, \FSSize} + + \FSCreate{testFSC}{defaultValue} + \Expect*{\FSSize{testFSC}}{0} + \Expect*{\FSTop{testFSC}}{defaultValue} + \Expect*{\FSBottom{testFSC}}{defaultValue} + \FSPush{testFSC}{value1} + \Expect*{\FSSize{testFSC}}{1} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value1} + \FSUnshift{testFSC}{value-1} + \Expect*{\FSSize{testFSC}}{2} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSPush{testFSC}{value2} + \Expect*{\FSSize{testFSC}}{3} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSUnshift{testFSC}{value-2} + \Expect*{\FSSize{testFSC}}{4} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-2} + \FSClear{testFSC} + \Expect*{\FSSize{testFSC}}{0} + \Expect*{\FSTop{testFSC}}{defaultValue} + \Expect*{\FSBottom{testFSC}}{defaultValue} + \FSPush{testFSC}{value1} + \Expect*{\FSSize{testFSC}}{1} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value1} + \FSUnshift{testFSC}{value-1} + \Expect*{\FSSize{testFSC}}{2} + \Expect*{\FSTop{testFSC}}{value1} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSPush{testFSC}{value2} + \Expect*{\FSSize{testFSC}}{3} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-1} + \FSUnshift{testFSC}{value-2} + \Expect*{\FSSize{testFSC}}{4} + \Expect*{\FSTop{testFSC}}{value2} + \Expect*{\FSBottom{testFSC}}{value-2} + \FSDestroy{testFSC} +\end{qstest} +% +% \end{macrocode} +% +% \section{Code for the FIFO/stack package} +% +% \subsection{Identification} +% +% \begin{macrocode} +%<*package> +\ProvidesPackage{fifo-stack}[2014/03/24 v1.0 Multi-FIFO/stack system] +\RequirePackage{ifthen} +% \end{macrocode} +% +% \subsection{FIFO/stack creation and destruction macro definitions} +% +% In the following code, we use only three counters (in the \TeX\ meaning) we +% store the various values in macros, and use only the top, bottom or size +% counters when we need to do computations. +% +% \begin{macro}{\tmp@fifo@stack@top} +% \begin{macrocode} +\newcount\tmp@fifo@stack@top +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\tmp@fifo@stack@bottom} +% \begin{macrocode} +\newcount\tmp@fifo@stack@bottom +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\tmp@fifo@stack@size} +% \begin{macrocode} +\newcount\tmp@fifo@stack@size +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\fifo@stack@pointer} +% +% All items in a given FIFO/stack named \verb|fifoStackName| are stored in +% dynamically defined macros whose names consist of the \verb|fifoStackName| +% followed by \verb|@| followed by the value of the \verb|\fifo@stack@pointer| +% macro with either \verb|\tmp@fifo@stack@top| or \verb|\tmp@fifo@stack@bottom| +% counters as argument. +% +% We start by providing a unit test of the expected behaviour of the\\ +% \verb|\fifo@stack@pointer| macro. +% +% \begin{macrocode} +% +%<*qstest> +\begin{qstest}{Unit test of \fifo@stack@pointer}{\fifo@stack@pointer} + \makeatletter + \Expect*{\fifo@stack@pointer{1}}{ii} + \Expect*{\fifo@stack@pointer{0}}{i} + \Expect*{\fifo@stack@pointer{-1}}{@i} + \makeatother +\end{qstest} +% +%<*package> +% \end{macrocode} +% +% Now the macrocode itself. Note the only two uses of the $\varepsilon$-\TeX\ +% \verb|\numexpr| macro. +% +% \begin{macrocode} +\global\def\fifo@stack@pointer#1{% + \ifnum#1<0 + @\expandafter\romannumeral\numexpr -1*#1 \relax + \else + \expandafter\romannumeral\numexpr #1+1 \relax + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\FSCreate} +% +% Creating a new FIFO/stack is, essentially, creating new counter-like top, +% bottom and size macros, initializing them to 0, 1 and 0 respectively, as well +% as creating macros for stack-top and stack-bottom evaluation (see next two +% macros below). +% +% \begin{macrocode} +%txs\FSCreate{fifoStackName}{defaultValue}# +\newcommand\FSCreate[2]{% + \expandafter\gdef\csname #1@fifo@stack@count@top\endcsname{0}% + \expandafter\gdef\csname #1@fifo@stack@count@bottom\endcsname{1}% + \expandafter\gdef\csname #1@fifo@stack@count@size\endcsname{0}% + \expandafter\do@fifo@stack@top@macro% + \csname #1@fifo@stack@count@top\endcsname{#1}{#2}% + \expandafter\do@fifo@stack@bottom@macro% + \csname #1@fifo@stack@count@bottom\endcsname{#1}{#2}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\do@fifo@stack@top@macro} +% +% This stack-top evaluation macro is required due to an ugly trick. During the +% push, we ``evaluate'' the value to push with an \verb|\edef|, because one +% might want to push something which contains the previous top of the stack (see +% the example package provided). If the \verb|\FSTop| or \verb|FSBottom| macros +% compute the real value on the top or bottom of the stack, then, the expanded +% definition in \verb|\FSPush| will contain more or less the \emph{content} of +% \verb|\FSTop| and not the value. +% +% Another way would be to have a \verb|\csname...\endcsname| pair within +% another one in an \verb|\ifx| condition, which doesn't work. +% +% \begin{macrocode} +\newcommand\do@fifo@stack@top@macro[3]{% + \expandafter\newcommand\expandafter*% + \csname fifo@stack@top@#2\endcsname{% + \expandafter\ifx\csname #2@\fifo@stack@pointer#1\endcsname\relax + #3% + \else + \csname #2@\fifo@stack@pointer#1\endcsname + \fi + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\do@fifo@stack@bottom@macro} +% +% This is the stack-bottom macro defined for the same reasons as +% \verb|\do@fifo@stack@top@macro| (see above). +% +% \begin{macrocode} +\newcommand\do@fifo@stack@bottom@macro[3]{% + \expandafter\newcommand\expandafter*% + \csname fifo@stack@bottom@#2\endcsname{% + \expandafter\ifx\csname #2@\fifo@stack@pointer#1\endcsname\relax + #3% + \else + \csname #2@\fifo@stack@pointer#1\endcsname + \fi + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\FSClear} +% +% While the size of the FIFO/stack is greater than zero, pop the FIFO/stack. +% Note the only use of the \verb|ifthen| package's \verb|\whiledo| macro. +% +% \begin{macrocode} +%txs\FSClear{fifoStackName}# +\newcommand{\FSClear}[1]{% + \whiledo{0 < \FSSize{#1}}{\FSPop{#1}} +} +% \end{macrocode} + +% \end{macro} +% +% \begin{macro}{\FSDestroy} +% +% Clear the FIFO/stack and then undefine all of the supporting macros. +% +% We provide a unit test of the expected behaviour of the \verb|\FSDestroy| +% macro. +% +% \begin{macrocode} +% +%<*qstest> +\begin{qstest}{Unit test of \FSdestroy} + {\FSCreate, \FSDestroy} + + \FSCreate{testFSDestroy}{defaultValue} + \makeatletter + \ExpectIfThen{\isnamedefined{testFSDestroy@fifo@stack@count@top}} + \ExpectIfThen{\isnamedefined{testFSDestroy@fifo@stack@count@bottom}} + \ExpectIfThen{\isnamedefined{testFSDestroy@fifo@stack@count@size}} + \ExpectIfThen{\isnamedefined{fifo@stack@top@testFSDestroy}} + \ExpectIfThen{\isnamedefined{fifo@stack@bottom@testFSDestroy}} + \makeatother + \FSDestroy{testFSDestroy} + \makeatletter + \ExpectIfThen{\isundefined\testFSDestroy@fifo@stack@count@top} + \ExpectIfThen{\isundefined\testFSDestroy@fifo@stack@count@bottom} + \ExpectIfThen{\isundefined\testFSDestroy@fifo@stack@count@size} + \ExpectIfThen{\isundefined\fifo@stack@top@testFSDestroy} + \ExpectIfThen{\isundefined\fifo@stack@bottom@testFSDestroy} + \makeatother +\end{qstest} +% +%<*package> +% \end{macrocode} +% +% And now the macrocode for \verb|\FSDestroy|. +% +% \begin{macrocode} +%txs\FSDestroy{fifoStackName}# +\newcommand{\FSDestroy}[1]{% + \FSClear{#1} + \expandafter\global\expandafter\let + \csname #1@fifo@stack@count@top\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname #1@fifo@stack@count@bottom\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname #1@fifo@stack@count@size\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname fifo@stack@top@#1\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname fifo@stack@bottom@#1\endcsname= + \fifo@stack@never@defined\relax +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Stack based macro definitions} +% +% \begin{macro}{\FSTop} +% I'd rather remove the ``check'' code, but, well, it would suppose +% the end-user of the macro is a fair developer, which is not +% realistic. +% +% If the stack has been properly created, we call the top-stack evaluation +% macro. +% +% \begin{macrocode} +%txs\FSTop{fifoStackName}# +\newcommand\FSTop[1]{% + \ifx\csname #1@fifo@stack@count@top\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \csname fifo@stack@top@#1\endcsname + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\FSPush} +% The \verb|\FSPush| macro is one of the most complex ones. +% +% We provide a unit test of the ability to use \verb|\FSTop| inside the value +% argument to a \verb|\FSPush| macro (which is the reason for the complexity of +% this macro). +% +% \begin{macrocode} +% +%<*qstest> +\begin{qstest}{Unit test of \FSPush and \FSTop} + {\FSCreate, \FSPush, \FSTop} + + \FSCreate{testFSPush}{defaultValue} + \Expect*{\FSTop{testFSPush}}{defaultValue} + \FSPush{testFSPush}{\FSTop{testFSPush}-with-additional-text} + \Expect*{\FSTop{testFSPush}}{defaultValue-with-additional-text} +\end{qstest} +% +%<*package> +% \end{macrocode} +% +% And now the macrocode for \verb|\FSPush|. First, we check if the stack is +% properly defined. +% +% \begin{macrocode} +%txs\FSPush{fifoStackName}{value}# +\newcommand\FSPush[2]{% + \ifx\csname #1@fifo@stack@count@top\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else +% \end{macrocode} +% +% We store the new top-value in a macro, just because one might do +% \begin{quote} +% \verb|\FSPush{stack}{\FSTop{stack}.ext}| +% \end{quote} +% in which case the expansion of +% the value to push is something rather tricky. +% +% Then, we step the top of the stack (put the top in the scratch +% counter, advance this counter, have the value back in the macro). +% +% We separately adjust the size macro. We do this since actually computing the +% value in the \verb|\FSSize| macro proved difficult. +% +% Only after that, the value to be pushed is stored in the corresponding +% slot. +% \begin{macrocode} + \edef\fifo@stack@newtop{#2}% + \tmp@fifo@stack@top\csname #1@fifo@stack@count@top\endcsname\relax + \global\advance\tmp@fifo@stack@top by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@top\endcsname + {\the\tmp@fifo@stack@top}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \expandafter\xdef\csname #1@\fifo@stack@pointer\tmp@fifo@stack@top\endcsname + {\fifo@stack@newtop}% + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\FSPop} +% The \verb|\FSPop| macro is simpler: if the stack is properly defined and +% the stack-top is greater than or equal to the stack-bottom, then we undefine +% the existing `top' macro and down-step the stack-top and stack-size. +% \begin{macrocode} +%txs\FSPop{fifoStackName}# +\newcommand\FSPop[1]{% + \ifx\csname #1@fifo@stack@count@top\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \tmp@fifo@stack@top\csname #1@fifo@stack@count@top\endcsname\relax + \tmp@fifo@stack@bottom\csname #1@fifo@stack@count@bottom\endcsname\relax + \ifnum\tmp@fifo@stack@top<\tmp@fifo@stack@bottom\relax\else + \expandafter\global\expandafter\let + \csname #1@\fifo@stack@pointer\tmp@fifo@stack@top\endcsname= + \fifo@stack@never@defined\relax + \advance\tmp@fifo@stack@top by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@top\endcsname + {\the\tmp@fifo@stack@top}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% +% Now, a debug only macro. +% \begin{macro}{\FSShowTop} +% \begin{macrocode} +%txs\FSShowTop{fifoStackName}# +\newcommand\FSShowTop[1]{% + {\edef\fifo@stack@top{\FSTop{#1}}% + \typeout{The top of #1: \fifo@stack@top}}} +% \end{macrocode} +% \end{macro} +% +% \subsection{FIFO based macro definitions} +% +% \begin{macro}{\FSBottom} +% \begin{macrocode} +%txs\FSBottom{fifoStackName}# +\newcommand\FSBottom[1]{% + \ifx\csname #1@fifo@stack@count@bottom\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \csname fifo@stack@bottom@#1\endcsname + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\FSUnshift} +% The \verb|\FSUnshift| macro, like the corresponding \verb|\FSPush| macro, is +% one of the most complex ones. +% +% % We provide a unit test of the ability to use \verb|\FSBottom| inside the value +% argument to a \verb|\FSUnshift| macro (which is the reason for the complexity of +% this macro). +% +% \begin{macrocode} +% +%<*qstest> +\begin{qstest}{Unit test of \FSUnshift and \FSBottom} + {\FSCreate, \FSUnshift, \FSBottom} + + \FSCreate{testFSUnshift}{defaultValue} + \Expect*{\FSBottom{testFSUnshift}}{defaultValue} + \FSUnshift{testFSUnshift}{\FSBottom{testFSUnshift}-with-additional-text} + \Expect*{\FSBottom{testFSUnshift}}{defaultValue-with-additional-text} +\end{qstest} +% +%<*package> +% \end{macrocode} +% +% And now the macrocode for \verb|\FSUnshift|. First, we check if the stack is +% properly defined. +% +% \begin{macrocode} +%txs\FSUnshift{fifoStackName}{value}# +\newcommand\FSUnshift[2]{% + \ifx\csname #1@fifo@stack@count@bottom\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else +% \end{macrocode} +% +% We store the new bottom-value in a macro, just because one might do +% \begin{quote} +% \verb|\FSUnshift{stack}{\FSBottom{stack}.ext}| +% \end{quote} +% in which case the expansion of +% the value to push is something rather tricky. +% +% Then, we step the bottom of the stack (put the bottom in the scratch +% counter, decrement this counter, have the value back in the macro). +% +% We separately adjust the size macro. We do this since actually computing the +% value in the \verb|\FSSize| macro proved difficult. +% +% Only after that, the value to be unshifted is stored in the corresponding +% slot. +% \begin{macrocode} + \edef\fifo@stack@newBottom{#2}% + \tmp@fifo@stack@bottom\csname #1@fifo@stack@count@bottom\endcsname\relax + \global\advance\tmp@fifo@stack@bottom by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@bottom\endcsname + {\the\tmp@fifo@stack@bottom}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \expandafter\xdef\csname #1@\fifo@stack@pointer\tmp@fifo@stack@bottom\endcsname + {\fifo@stack@newBottom}% + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\FSShift} +% The \verb|\FSShift| macro is fairly simple: if the stack is properly defined +% and the stack-top is greater than or equal to the stack-bottom, then we undefine +% the `bottom' macro and up-step the stack-bottom and adjust the stack-size. +% \begin{macrocode} +%txs\FSShift{fifoStackName}# +\newcommand\FSShift[1]{% + \ifx\csname #1@fifo@stack@count@bottom\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \tmp@fifo@stack@top\csname #1@fifo@stack@count@top\endcsname\relax + \tmp@fifo@stack@bottom\csname #1@fifo@stack@count@bottom\endcsname\relax + \ifnum\tmp@fifo@stack@top<\tmp@fifo@stack@bottom\relax\else + \expandafter\global\expandafter\let + \csname #1@\fifo@stack@pointer\tmp@fifo@stack@bottom\endcsname= + \fifo@stack@never@defined\relax + \advance\tmp@fifo@stack@bottom by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@bottom\endcsname + {\the\tmp@fifo@stack@bottom}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \fi + \fi +} +% \end{macrocode} +% \end{macro} +% +% Again, a debug only macro for the FIFO usage. +% \begin{macro}{\FSShowBottom} +% \begin{macrocode} +%txs\FSShowBottom{fifoStackName}# +\newcommand\FSShowBottom[1]{% + {\edef\fifo@stack@bottom{\FSBottom{#1}}% + \typeout{The bottom of #1: \fifo@stack@bottom}}} +% \end{macrocode} +% \end{macro} +% +% \subsection{FIFO/stack length macro definition} +% +% \begin{macro}{\FSSize} +% +% We keep track of the changes to the stack-size in each of the \verb|\FSPush|, +% \verb|\FSPop|, \verb|\FSUnshift|, and \verb|\FSShift| macros, since actually +% computing the value in the \verb|\FSSize| macro (below) was returning spurious +% tokens. +% +% \begin{macrocode} +%txs\FSSize{fifoStackName}# +\newcommand\FSSize[1]{\csname #1@fifo@stack@count@size\endcsname} +% \end{macrocode} +% \end{macro} +% +% \subsection{Finishing off} +% +% \begin{macrocode} +% +%<*qstest> +\LogClose{lgout} +\stop +% +% \end{macrocode} +% \ No newline at end of file diff --git a/Master/texmf-dist/source/latex/fifo-stack/fifo-stack.ins b/Master/texmf-dist/source/latex/fifo-stack/fifo-stack.ins new file mode 100644 index 00000000000..6e3ee5e0190 --- /dev/null +++ b/Master/texmf-dist/source/latex/fifo-stack/fifo-stack.ins @@ -0,0 +1,45 @@ +\def\batchfile{fifo-stack.ins} + +\input{docstrip.tex} + +\preamble + +Copyright (C) 2014 Stephen Gaito (PerceptiSys Ltd) + +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 +2005/12/01 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Stephen Gaito. + +The released source can be found at: +https://github.com/diSimplex/latexFifoStack/tree/master/texStyle + +The development source can be found at: +https://github.com/stephengaito/latexFifoStack/tree/master/texStyle + +This work consists of the files fifo-stack.dtx, and fifo-stack.ins. + +The command: + pdflatex fifo-stack.ins +followed by: + pdflatex fifo-stack.dtx +will produce the derived files: fifo-stack.sty, fifo-stack-test.tex, +and fifo-stack.pdf. + +The command: + pdflatex fifo-stack-test.tex +will regression test the fifo-stack package. Output will be found in +fifo-stack-test.lgout. If pdflatex completes with no errors, then all +regression tests passed. + +\endpreamble + +\generateFile{fifo-stack.sty}{f}{\from{fifo-stack.dtx}{package}} +\generateFile{fifo-stack-test.tex}{f}{\from{fifo-stack.dtx}{qstest}} diff --git a/Master/texmf-dist/tex/latex/fifo-stack/fifo-stack.sty b/Master/texmf-dist/tex/latex/fifo-stack/fifo-stack.sty new file mode 100644 index 00000000000..95a2b746f19 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fifo-stack/fifo-stack.sty @@ -0,0 +1,210 @@ +%% +%% This is file `fifo-stack.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fifo-stack.dtx (with options: `package') +%% +%% Copyright (C) 2014 Stephen Gaito (PerceptiSys Ltd) +%% +%% 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 +%% 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Stephen Gaito. +%% +%% The released source can be found at: +%% https://github.com/diSimplex/latexFifoStack/tree/master/texStyle +%% +%% The development source can be found at: +%% https://github.com/stephengaito/latexFifoStack/tree/master/texStyle +%% +%% This work consists of the files fifo-stack.dtx, and fifo-stack.ins. +%% +%% The command: +%% pdflatex fifo-stack.ins +%% followed by: +%% pdflatex fifo-stack.dtx +%% will produce the derived files: fifo-stack.sty, fifo-stack-test.tex, +%% and fifo-stack.pdf. +%% +%% The command: +%% pdflatex fifo-stack-test.tex +%% will regression test the fifo-stack package. Output will be found in +%% fifo-stack-test.lgout. If pdflatex completes with no errors, then all +%% regression tests passed. +%% +\ProvidesPackage{fifo-stack}[2014/03/24 v1.0 Multi-FIFO/stack system] +\RequirePackage{ifthen} +\newcount\tmp@fifo@stack@top +\newcount\tmp@fifo@stack@bottom +\newcount\tmp@fifo@stack@size +\global\def\fifo@stack@pointer#1{% + \ifnum#1<0 + @\expandafter\romannumeral\numexpr -1*#1 \relax + \else + \expandafter\romannumeral\numexpr #1+1 \relax + \fi +} +\newcommand\FSCreate[2]{% + \expandafter\gdef\csname #1@fifo@stack@count@top\endcsname{0}% + \expandafter\gdef\csname #1@fifo@stack@count@bottom\endcsname{1}% + \expandafter\gdef\csname #1@fifo@stack@count@size\endcsname{0}% + \expandafter\do@fifo@stack@top@macro% + \csname #1@fifo@stack@count@top\endcsname{#1}{#2}% + \expandafter\do@fifo@stack@bottom@macro% + \csname #1@fifo@stack@count@bottom\endcsname{#1}{#2}% +} +\newcommand\do@fifo@stack@top@macro[3]{% + \expandafter\newcommand\expandafter*% + \csname fifo@stack@top@#2\endcsname{% + \expandafter\ifx\csname #2@\fifo@stack@pointer#1\endcsname\relax + #3% + \else + \csname #2@\fifo@stack@pointer#1\endcsname + \fi + }% +} +\newcommand\do@fifo@stack@bottom@macro[3]{% + \expandafter\newcommand\expandafter*% + \csname fifo@stack@bottom@#2\endcsname{% + \expandafter\ifx\csname #2@\fifo@stack@pointer#1\endcsname\relax + #3% + \else + \csname #2@\fifo@stack@pointer#1\endcsname + \fi + }% +} +\newcommand{\FSClear}[1]{% + \whiledo{0 < \FSSize{#1}}{\FSPop{#1}} +} + +\newcommand{\FSDestroy}[1]{% + \FSClear{#1} + \expandafter\global\expandafter\let + \csname #1@fifo@stack@count@top\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname #1@fifo@stack@count@bottom\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname #1@fifo@stack@count@size\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname fifo@stack@top@#1\endcsname= + \fifo@stack@never@defined\relax + \expandafter\global\expandafter\let + \csname fifo@stack@bottom@#1\endcsname= + \fifo@stack@never@defined\relax +} +\newcommand\FSTop[1]{% + \ifx\csname #1@fifo@stack@count@top\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \csname fifo@stack@top@#1\endcsname + \fi +} +\newcommand\FSPush[2]{% + \ifx\csname #1@fifo@stack@count@top\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \edef\fifo@stack@newtop{#2}% + \tmp@fifo@stack@top\csname #1@fifo@stack@count@top\endcsname\relax + \global\advance\tmp@fifo@stack@top by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@top\endcsname + {\the\tmp@fifo@stack@top}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \expandafter\xdef\csname #1@\fifo@stack@pointer\tmp@fifo@stack@top\endcsname + {\fifo@stack@newtop}% + \fi +} +\newcommand\FSPop[1]{% + \ifx\csname #1@fifo@stack@count@top\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \tmp@fifo@stack@top\csname #1@fifo@stack@count@top\endcsname\relax + \tmp@fifo@stack@bottom\csname #1@fifo@stack@count@bottom\endcsname\relax + \ifnum\tmp@fifo@stack@top<\tmp@fifo@stack@bottom\relax\else + \expandafter\global\expandafter\let + \csname #1@\fifo@stack@pointer\tmp@fifo@stack@top\endcsname= + \fifo@stack@never@defined\relax + \advance\tmp@fifo@stack@top by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@top\endcsname + {\the\tmp@fifo@stack@top}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \fi + \fi +} +\newcommand\FSShowTop[1]{% + {\edef\fifo@stack@top{\FSTop{#1}}% + \typeout{The top of #1: \fifo@stack@top}}} +\newcommand\FSBottom[1]{% + \ifx\csname #1@fifo@stack@count@bottom\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \csname fifo@stack@bottom@#1\endcsname + \fi +} +\newcommand\FSUnshift[2]{% + \ifx\csname #1@fifo@stack@count@bottom\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \edef\fifo@stack@newBottom{#2}% + \tmp@fifo@stack@bottom\csname #1@fifo@stack@count@bottom\endcsname\relax + \global\advance\tmp@fifo@stack@bottom by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@bottom\endcsname + {\the\tmp@fifo@stack@bottom}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \expandafter\xdef\csname #1@\fifo@stack@pointer\tmp@fifo@stack@bottom\endcsname + {\fifo@stack@newBottom}% + \fi +} +\newcommand\FSShift[1]{% + \ifx\csname #1@fifo@stack@count@bottom\endcsname\relax + \PackageError{fifo-stack}{Undefined FIFO/stack #1}% + {You should first create the FIFO/stack with \FSCreate}% + \else + \tmp@fifo@stack@top\csname #1@fifo@stack@count@top\endcsname\relax + \tmp@fifo@stack@bottom\csname #1@fifo@stack@count@bottom\endcsname\relax + \ifnum\tmp@fifo@stack@top<\tmp@fifo@stack@bottom\relax\else + \expandafter\global\expandafter\let + \csname #1@\fifo@stack@pointer\tmp@fifo@stack@bottom\endcsname= + \fifo@stack@never@defined\relax + \advance\tmp@fifo@stack@bottom by 1\relax + \expandafter\xdef\csname #1@fifo@stack@count@bottom\endcsname + {\the\tmp@fifo@stack@bottom}% + \tmp@fifo@stack@size\csname #1@fifo@stack@count@size\endcsname\relax + \global\advance\tmp@fifo@stack@size by -1\relax + \expandafter\xdef\csname #1@fifo@stack@count@size\endcsname + {\the\tmp@fifo@stack@size}% + \fi + \fi +} +\newcommand\FSShowBottom[1]{% + {\edef\fifo@stack@bottom{\FSBottom{#1}}% + \typeout{The bottom of #1: \fifo@stack@bottom}}} +\newcommand\FSSize[1]{\csname #1@fifo@stack@count@size\endcsname} +\endinput +%% +%% End of file `fifo-stack.sty'. diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 09e2399d2f4..d1d68d141ca 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -193,7 +193,7 @@ my @TLP_working = qw( FAQ-en fast-diagram fbb fbithesis fbs fc fcltxdoc fdsymbol featpost fenixpar fetamont feupphdteses feyn feynmf feynmp-auto fge - fifinddo-info fig4latex figbas figbib figflow figsize + fifinddo-info fifo-stack fig4latex figbas figbib figflow figsize filecontents filedate filehook fileinfo filemod findhyph fink finstrut fira first-latex-doc fix2col fixfoot fixlatvian fixltxhyph fixme fixmetodonotes fixpdfmag diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index ad6b4c9328f..f6e4932619e 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -284,6 +284,7 @@ depend fancynum depend fancypar depend fancytabs depend fancytooltips +depend fifo-stack depend figsize depend filecontents depend filedate diff --git a/Master/tlpkg/tlpsrc/fifo-stack.tlpsrc b/Master/tlpkg/tlpsrc/fifo-stack.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3