texlive[52582] Master/texmf-dist: pseudo (30oct19)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 30 22:19:16 CET 2019
Revision: 52582
http://tug.org/svn/texlive?view=revision&revision=52582
Author: karl
Date: 2019-10-30 22:19:15 +0100 (Wed, 30 Oct 2019)
Log Message:
-----------
pseudo (30oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/pseudo/Makefile
trunk/Master/texmf-dist/doc/latex/pseudo/VERSION
trunk/Master/texmf-dist/doc/latex/pseudo/doc/fig/readmefig.svg
trunk/Master/texmf-dist/doc/latex/pseudo/doc/pseudo.pdf
trunk/Master/texmf-dist/doc/latex/pseudo/doc/pseudo.tex
trunk/Master/texmf-dist/tex/latex/pseudo/pseudo.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/pseudo/test/
trunk/Master/texmf-dist/doc/latex/pseudo/test/pseudotest.tex
Modified: trunk/Master/texmf-dist/doc/latex/pseudo/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pseudo/Makefile 2019-10-30 21:19:01 UTC (rev 52581)
+++ trunk/Master/texmf-dist/doc/latex/pseudo/Makefile 2019-10-30 21:19:15 UTC (rev 52582)
@@ -2,6 +2,7 @@
LATEX=latexmk -norc -pdf -auxdir=build -outdir=build
FIGS=build/hilitefig.pdf build/pausefig.pdf build/kwfig.pdf
+TESTS=build/pseudotest.pdf
all: $(TARGETS)
@@ -8,7 +9,7 @@
doc/pseudo.pdf: build/pseudo.pdf
cp $< $@
-build/pseudo.pdf: doc/pseudo.tex build/pseudo.bib $(FIGS) README.md
+build/pseudo.pdf: doc/pseudo.tex build/pseudo.bib $(FIGS) $(TESTS) README.md pseudo.sty
$(LATEX) $<
build/pseudo.bib: doc/pseudo.bib
@@ -23,6 +24,9 @@
build/kwfig.pdf: doc/fig/kwfig.tex pseudo.sty
$(LATEX) $<
+build/pseudotest.pdf: test/pseudotest.tex pseudo.sty
+ $(LATEX) $<
+
pseudo.sty: VERSION LICENSE doc/pseudo.tex
cat LICENSE | sed -e "s/^/% /" | sed -e "s/^% \$$/%/" > pseudo.sty
echo "%" >> pseudo.sty
@@ -33,7 +37,7 @@
-e "s/_@@/__pseudo/g" \
-e "s/@@/__pseudo/g" \
-e "s/VERSION/$$(cat VERSION)/g" \
- -e "s/DATE/$$(date +"%Y-%m-%d")/g" \
+ -e "s/DATE/$$(date +"%Y\/%m\/%d")/g" \
-e "s/[ ]*%.*\$$//" \
-e "/^\$$/d" \
-e "p" \
Modified: trunk/Master/texmf-dist/doc/latex/pseudo/VERSION
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pseudo/VERSION 2019-10-30 21:19:01 UTC (rev 52581)
+++ trunk/Master/texmf-dist/doc/latex/pseudo/VERSION 2019-10-30 21:19:15 UTC (rev 52582)
@@ -1 +1 @@
-1.1.2
+1.1.3
Modified: trunk/Master/texmf-dist/doc/latex/pseudo/doc/fig/readmefig.svg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pseudo/doc/fig/readmefig.svg 2019-10-30 21:19:01 UTC (rev 52581)
+++ trunk/Master/texmf-dist/doc/latex/pseudo/doc/fig/readmefig.svg 2019-10-30 21:19:15 UTC (rev 52582)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="249.005pt" height="144.458pt" viewBox="0 0 249.005 144.458" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="249.212pt" height="144.458pt" viewBox="0 0 249.212 144.458" version="1.1">
<defs>
<g>
<symbol overflow="visible" id="glyph0-0">
@@ -233,80 +233,80 @@
<use xlink:href="#glyph1-6" x="0.000000000000035527" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph4-4" x="47.16125" y="66.81125"/>
- <use xlink:href="#glyph4-1" x="51.312693" y="66.81125"/>
+ <use xlink:href="#glyph4-4" x="47.265" y="66.81125"/>
+ <use xlink:href="#glyph4-1" x="51.416443" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-7" x="60.86" y="66.81125"/>
+ <use xlink:href="#glyph1-7" x="60.96375" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-8" x="72.3275" y="66.81125"/>
+ <use xlink:href="#glyph2-8" x="72.43125" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-4" x="87.863282" y="66.81125"/>
+ <use xlink:href="#glyph2-4" x="87.967032" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-6" x="95.475756" y="66.81125"/>
+ <use xlink:href="#glyph2-6" x="95.579506" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-1" x="99.53375" y="66.81125"/>
- <use xlink:href="#glyph3-2" x="103.26975" y="66.81125"/>
- <use xlink:href="#glyph3-3" x="110.74175" y="66.81125"/>
+ <use xlink:href="#glyph3-1" x="99.6375" y="66.81125"/>
+ <use xlink:href="#glyph3-2" x="103.3735" y="66.81125"/>
+ <use xlink:href="#glyph3-3" x="110.8455" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-4" x="116.71935" y="66.81125"/>
- <use xlink:href="#glyph3-1" x="123.44415" y="66.81125"/>
+ <use xlink:href="#glyph3-4" x="116.8231" y="66.81125"/>
+ <use xlink:href="#glyph3-1" x="123.5479" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-8" x="132.88125" y="66.81125"/>
+ <use xlink:href="#glyph2-8" x="132.985" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-5" x="148.417032" y="66.81125"/>
+ <use xlink:href="#glyph2-5" x="148.520782" y="66.81125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-8" x="0.000000000000053291" y="84.86875"/>
+ <use xlink:href="#glyph1-8" x="0.000000000000035527" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="76.0325" y="84.86875"/>
- <use xlink:href="#glyph0-2" x="87.551335" y="84.86875"/>
+ <use xlink:href="#glyph0-1" x="76.24" y="84.86875"/>
+ <use xlink:href="#glyph0-2" x="87.758835" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-3" x="96.387722" y="84.86875"/>
- <use xlink:href="#glyph0-4" x="105.221121" y="84.86875"/>
- <use xlink:href="#glyph0-5" x="114.719527" y="84.86875"/>
+ <use xlink:href="#glyph0-3" x="96.595222" y="84.86875"/>
+ <use xlink:href="#glyph0-4" x="105.428621" y="84.86875"/>
+ <use xlink:href="#glyph0-5" x="114.927027" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-2" x="125.876718" y="84.86875"/>
- <use xlink:href="#glyph0-6" x="135.041873" y="84.86875"/>
- <use xlink:href="#glyph0-7" x="144.04115" y="84.86875"/>
+ <use xlink:href="#glyph0-2" x="126.084218" y="84.86875"/>
+ <use xlink:href="#glyph0-6" x="135.249373" y="84.86875"/>
+ <use xlink:href="#glyph0-7" x="144.24865" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-1" x="153.37125" y="84.86875"/>
+ <use xlink:href="#glyph1-1" x="153.57875" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-1" x="159.06125" y="84.86875"/>
+ <use xlink:href="#glyph2-1" x="159.26875" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-2" x="168.398261" y="84.86875"/>
+ <use xlink:href="#glyph2-2" x="168.605761" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-3" x="174.958677" y="84.86875"/>
+ <use xlink:href="#glyph2-3" x="175.166177" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-2" x="186.671784" y="84.86875"/>
+ <use xlink:href="#glyph2-2" x="186.879284" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-7" x="193.217256" y="84.86875"/>
- <use xlink:href="#glyph2-2" x="201.545548" y="84.86875"/>
+ <use xlink:href="#glyph2-7" x="193.424756" y="84.86875"/>
+ <use xlink:href="#glyph2-2" x="201.753048" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-5" x="208.105964" y="84.86875"/>
+ <use xlink:href="#glyph2-5" x="208.313464" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-2" x="213.0975" y="84.86875"/>
+ <use xlink:href="#glyph1-2" x="213.30625" y="84.86875"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-9" x="0.000000000000035527" y="102.92625"/>
+ <use xlink:href="#glyph1-9" x="0.000000000000071054" y="102.92625"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph4-1" x="18.29" y="102.92625"/>
@@ -333,79 +333,79 @@
<use xlink:href="#glyph2-3" x="93.8425" y="102.92625"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-10" x="0.000000000000035527" y="120.98375"/>
+ <use xlink:href="#glyph1-10" x="0.000000000000071054" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph4-4" x="47.16125" y="120.98375"/>
- <use xlink:href="#glyph4-1" x="51.312693" y="120.98375"/>
+ <use xlink:href="#glyph4-4" x="47.265" y="120.98375"/>
+ <use xlink:href="#glyph4-1" x="51.416443" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-7" x="60.86" y="120.98375"/>
- <use xlink:href="#glyph2-6" x="69.188291" y="120.98375"/>
+ <use xlink:href="#glyph2-7" x="60.96375" y="120.98375"/>
+ <use xlink:href="#glyph2-6" x="69.292041" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-1" x="73.2525" y="120.98375"/>
- <use xlink:href="#glyph3-2" x="76.9885" y="120.98375"/>
- <use xlink:href="#glyph3-3" x="84.4605" y="120.98375"/>
+ <use xlink:href="#glyph3-1" x="73.35625" y="120.98375"/>
+ <use xlink:href="#glyph3-2" x="77.09225" y="120.98375"/>
+ <use xlink:href="#glyph3-3" x="84.56425" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph3-4" x="90.4381" y="120.98375"/>
- <use xlink:href="#glyph3-1" x="97.1629" y="120.98375"/>
+ <use xlink:href="#glyph3-4" x="90.54185" y="120.98375"/>
+ <use xlink:href="#glyph3-1" x="97.26665" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph6-1" x="106.8325" y="120.98375"/>
+ <use xlink:href="#glyph6-1" x="106.93625" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph6-1" x="115.0775" y="120.98375"/>
+ <use xlink:href="#glyph6-1" x="115.18125" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-7" x="127.1825" y="120.98375"/>
+ <use xlink:href="#glyph1-7" x="127.28625" y="120.98375"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph1-11" x="0.000000000000014211" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-1" x="76.0325" y="139.04125"/>
- <use xlink:href="#glyph0-2" x="87.551335" y="139.04125"/>
+ <use xlink:href="#glyph0-1" x="76.24" y="139.04125"/>
+ <use xlink:href="#glyph0-2" x="87.758835" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-3" x="96.387722" y="139.04125"/>
- <use xlink:href="#glyph0-4" x="105.221121" y="139.04125"/>
- <use xlink:href="#glyph0-5" x="114.719527" y="139.04125"/>
+ <use xlink:href="#glyph0-3" x="96.595222" y="139.04125"/>
+ <use xlink:href="#glyph0-4" x="105.428621" y="139.04125"/>
+ <use xlink:href="#glyph0-5" x="114.927027" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-2" x="125.876718" y="139.04125"/>
- <use xlink:href="#glyph0-6" x="135.041873" y="139.04125"/>
- <use xlink:href="#glyph0-7" x="144.04115" y="139.04125"/>
+ <use xlink:href="#glyph0-2" x="126.084218" y="139.04125"/>
+ <use xlink:href="#glyph0-6" x="135.249373" y="139.04125"/>
+ <use xlink:href="#glyph0-7" x="144.24865" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-1" x="153.37125" y="139.04125"/>
+ <use xlink:href="#glyph1-1" x="153.57875" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-1" x="159.06125" y="139.04125"/>
+ <use xlink:href="#glyph2-1" x="159.26875" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-2" x="168.398261" y="139.04125"/>
+ <use xlink:href="#glyph2-2" x="168.605761" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-3" x="174.958677" y="139.04125"/>
+ <use xlink:href="#glyph2-3" x="175.166177" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-2" x="186.671784" y="139.04125"/>
+ <use xlink:href="#glyph2-2" x="186.879284" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-7" x="193.217256" y="139.04125"/>
- <use xlink:href="#glyph2-2" x="201.545548" y="139.04125"/>
+ <use xlink:href="#glyph2-7" x="193.424756" y="139.04125"/>
+ <use xlink:href="#glyph2-2" x="201.753048" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph2-5" x="208.105964" y="139.04125"/>
+ <use xlink:href="#glyph2-5" x="208.313464" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-12" x="216.41875" y="139.04125"/>
+ <use xlink:href="#glyph1-12" x="216.62625" y="139.04125"/>
</g>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph1-3" x="231.117668" y="139.04125"/>
- <use xlink:href="#glyph1-2" x="238.434251" y="139.04125"/>
+ <use xlink:href="#glyph1-3" x="231.325168" y="139.04125"/>
+ <use xlink:href="#glyph1-2" x="238.641751" y="139.04125"/>
</g>
</g>
</svg>
Modified: trunk/Master/texmf-dist/doc/latex/pseudo/doc/pseudo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/pseudo/doc/pseudo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pseudo/doc/pseudo.tex 2019-10-30 21:19:01 UTC (rev 52581)
+++ trunk/Master/texmf-dist/doc/latex/pseudo/doc/pseudo.tex 2019-10-30 21:19:15 UTC (rev 52582)
@@ -431,6 +431,34 @@
\pkg[https://ctan.org/tex-archive/macros/latex/contrib/listings]{listings} and
\pkg[https://ctan.org/pkg/minted]{minted}, of course.
+\subsection*{Using older \TeX\ distributions}
+
+The imlementation of \pkg{pseudo} uses some functionality that isn't available
+in older \TeX\ distributions, in particular, older versions of
+\pkg[https://ctan.org/pkg/xparse]{xparse} and
+\pkg[https://ctan.org/pkg/expl3]{expl3}. Some care has been taken to make the
+code backward compatible to the point where it works on \TeX\ Live~2016, which
+is what is used (at the time of writing) on \href{https://arxiv.org}{arXiv}.
+If you run into issues somewhere else (e.g., when submitting to some publisher
+with a custom setup), feel free to
+\href{https://github.com/mlhetland/pseudo.sty/issues}{file an issue}, or even
+\href{https://github.com/mlhetland/pseudo.sty/pulls}{provide a pull request}
+with a fix. One thing to look out for is that older versions of
+\pkg[https://ctan.org/pkg/xparse]{xparse} parse arguments differently, so
+things like
+\begin{texexp}[listing only]
+foo\\<1>
+bar\\[hl]
+\end{texexp}
+would work, but separating the arguments with spaces, as in
+\begin{texexp}[listing only]
+foo\\ <1>
+bar\\ [hl]
+\end{texexp}
+will \emph{not} work, though this works with more recent versions (as seen
+from some of my examples, later). For more advice on working around an older
+distribution, see also \cref{sec:older}.
+
\section{Overview}
The main component of the \pkg{pseudo} package is the \refe{pseudo}
@@ -494,8 +522,10 @@
\verb|\def\While{\kw{while}}|, or using various declaration commands, such as
\refc{DeclarePseudoKeyword} or \refc{DeclarePseudoConstant}. Procedures and
functions capture parenthesized arguments and set them in math mode; this
-carries over in such shortcuts, so if you define \verb|\Euclid| to mean
-\verb|\pr{Euclid}|, then \code*{\cs{Euclid}(a, b)} yields \pr{Euclid}(a,b).
+carries over in shortcuts, so if you define \verb|\Euclid| to mean
+\verb|\pr{Euclid}|, then \code*{\cs{Euclid}(a, b)} yields
+\pr{Euclid}(a,b).\footnote{Note that \code*{\cs{Euclid} (a, b)}, with a space
+before the parenthetical, yields \pr{Euclid} (a, b).}
These commands are not used in the internals of the package, so they may be
freely redefined for different styling, such as \verb|\let\id\textsf|. They
@@ -1099,10 +1129,9 @@
This may not be enough, however. For example, if you're using
\pkg[https://ctan.org/pkg/standalone]{standalone} to produce individual
- pseudocode images, this compactness will \emph{not} be triggered
- automatically. In such cases, you can override the behavior using the
- \refk{compact} key, manually specifying whether you want the pseudocode to
- be compact or not.
+ pseudocode images, this compactness may not be triggered automatically. In
+ such cases, you can override the behavior using the \refk{compact} key,
+ manually specifying whether you want the pseudocode to be compact or not.
\end{docKey}
\begin{docCommand}{ct}{\marg{text}}
@@ -1323,7 +1352,7 @@
shortcut, and configurable via \refk{eqs-pad}, \refk{eqs-scale} and
\refk{eqs-sep}.
\end{docCommand}
-\begin{docKey}{eqs-pad}{\,=\,\meta{length}}{\initialkeyvalue{\code{0.28mu}}}
+\begin{docKey}{eqs-pad}{\,=\,\meta{muskip}}{\initialkeyvalue{\code{0.28mu}}}
The amount of space inserted on each side of \refc{eqs}.
\end{docKey}
\begin{docKey}{eqs-scale}{\,=\,\meta{number}}{\initialkeyvalue{\code{0.6785}}}
@@ -1330,7 +1359,7 @@
The amount of horizontal scaling applied to the \code{=} signs in
\refc{eqs}.
\end{docKey}
-\begin{docKey}{eqs-sep}{\,=\,\meta{length}}{\initialkeyvalue{\code{0.63mu}}}
+\begin{docKey}{eqs-sep}{\,=\,\meta{muskip}}{\initialkeyvalue{\code{0.63mu}}}
The amount of space inserted between the two \code{=} signs in \cs{eqs}.
\end{docKey}
@@ -1958,10 +1987,10 @@
\begin{docCommand}{st}{\marg{string}}
Typesets \meta{string} with added quotes using \refc{stfont}. (The entire
thing is wrapped in \cs{textnormal}.) For example, \code*{print
- \cs{st}\braces{42}} yields
+ \cs{st}\braces{42}} yields:
\begin{pseudo*}
print \st{42}
- \end{pseudo*}.
+ \end{pseudo*}
See also \refc{DeclarePseudoString}.
\fontutil{strings}
\pseudoshortcutted{st}
@@ -2263,7 +2292,7 @@
can achieve this in \pkg{pseudo} as well, by using the \code{+} and \code{-}
modifiers. (For example, the tab stops in
\pkg[https://ctan.org/pkg/clrscode3e]{clrscode3e} are set at fixed intervals,
-just like in \pkg{pseudo}.) But what i you'd like to align something that
+just like in \pkg{pseudo}.) But what if you'd like to align something that
comes later, such as comments after code lines? You can't simply use
\cs{hspace}, of course, unless the code lines themselves have exactly the same
length.
@@ -2567,7 +2596,69 @@
\refc{\bslash}. If it turns out there's a demand for something like that, I
might add it in a future version.
+\subsection{\dots\,use \pkg{pseudo} with older \TeX\ distributions?}
+\label{sec:older}
+
+As mentioned in the introduction, I've tried to make \pkg{pseudo} work with at
+least \emph{somewhat} outdated \TeX\ distributions. In these cases, the
+package itself won't be available as part of the distribution, of course, but
+you can simply download the file
+\texttt{\href{http://mirrors.ctan.org/macros/latex/contrib/pseudo/pseudo.sty}{pseudo.sty}}
+and place it in the directory where you're compiling your document (or
+anywhere else where your \LaTeX\ executable can find it).
+
+However, there may be cases where this just doesn't work, such as when
+submitting to a publisher with a really old setup.\footnote{If possible,
+though, feel free to
+\href{https://github.com/mlhetland/pseudo.sty/issues}{file an issue} or
+\href{https://github.com/mlhetland/pseudo.sty/pulls}{provide a pull request}
+to address the issue.}
+In that case, the simplest solution is probably to use the
+\pkg[https://ctan.org/pkg/standalone]{standalone} package to produce
+individual PDFs of your algorithms, and then to include those in your
+document. Then you can submit the PDFs rather than the \LaTeX, so that the
+pseudocode need not be compiled on the old system. Each algorithm could go in
+a file like this:
+
+\begin{texexp}[listing only]
+\documentclass{standalone}
+\usepackage{pseudo}
+\begin{document}
+\begin{pseudo}
+ ...
+\end{pseudo}
+\end{document}
+\end{texexp}
+
+\noindent
+Let's say this is compiled to \texttt{algo1.pdf}. You then include this file:
+
+\begin{texexp}[listing only]
+\documentclass{article}
+\usepackage{graphicx} % For \includegraphics
+...
+\begin{document}
+... sanctus est Lorem ipsum dolor sit amet:
+
+\medskip\noindent
+\includegraphics{algo1}
+
+\smallskip
+Lorem ipsum dolor sit amet, consetetur sadipscing ...
+\end{document}
+\end{texexp}
+
+\noindent
+Of course, you can adjust the spacing (e.g., using \verb|\vspace| or the like)
+to your liking. Using this method, you can can achieve results essentially
+identical to if you compiled the pseudocode directly as part of the document.
+Of course, you won't have access to other functionality (such as
+\verb|\DeclarePseudoIdentifier| or the like) for use in the main tex, but most
+of that should be possible to emulate by hand (possibly peeking at the
+implementation in \cref{sec:impl}).
+
\section{Implementation}
+\label{sec:impl}
\lstdefinestyle{tcblatex}{language={[LaTeX]TeX},
aboveskip={0\p@ \@plus 6\p@},
@@ -2678,13 +2769,12 @@
\subsection{Utilities}
\paragraph{Variants.} First, let's just generate a couple of expansion
-variants we'll need of some standard commands:
+variants we'll need of some standard commands. (I'm using the
+\verb|\q_no_value| machinery rather than \verb|\c_novalue_tl| for
+compatibility with older \TeX\ distributions.)
\begin{source}
-\cs_generate_variant:Nn \tl_if_novalue:nTF { VTF }
+\cs_generate_variant:Nn \quark_if_no_value:nTF { VTF }
\cs_generate_variant:Nn \tl_set:Nn { Ne }
-\cs_generate_variant:Nn \regex_extract_once:nnNTF { nVNTF }
-% \cs_generate_variant:Nn \regex_match:nnF { nVF }
-\cs_generate_variant:Nn \regex_match:nnF { neF }
\end{source}
\paragraph{Defining columns.} The \refk{preamble} is is configurable, but the
\pkg[https://ctan.org/pkg/array]{array} package makes sure it doesn't expand
@@ -2715,21 +2805,22 @@
\cs_new:Nn \@@_meta_new_cmd:NNnn {
\tl_set:Nn \l_tmpa_tl {pseudo \cs_to_str:N #2}
\exp_args:Nc
- #1 \l_tmpa_tl {#3} {#4}
+ #1 \l_tmpa_tl #3 {#4}
\cs_if_free:NT #2 {\cs_gset_eq:Nc #2 \l_tmpa_tl}
}
\cs_new:Nn \@@_new_cmd:Nnn {
\@@_meta_new_cmd:NNnn
- \NewDocumentCommand #1 {#2} {
+ \NewDocumentCommand #1 {{#2}} {
#3
}
}
-
\cs_new:Nn \@@_new_ecmd:Nnn {
\@@_meta_new_cmd:NNnn
- \NewExpandableDocumentCommand #1 {#2} {
+ % \NewExpandableDocumentCommand #1 {{#2}} {
+ % Replaced for compatibility:
+ \def #1 {#2} {
#3
}
}
@@ -2779,7 +2870,7 @@
\begin{source}
\cs_new:Nn \@@_set_indent_length: {
- \tl_if_novalue:VTF \l_@@_indent_length_tl {
+ \quark_if_no_value:VTF \l_@@_indent_length_tl {
\hbox_set:Nn \l_tmpa_box { \l_@@_indent_text_tl }
\dim_set:Nn \pseudoindentlength { \box_wd:N \l_tmpa_box }
} {
@@ -2921,11 +3012,13 @@
% Fallback, if that failed:
\cs_if_exist:NT \@defaultsubs {
\cs_gset_eq:NN \@@_b_or_bx: \bfseries
- \group_insert_after:N \@@_b_or_bx:
}
\group_end:
+ % Make sure the new version is used:
+ \@@_b_or_bx:
+
}
\end{source}
Note that the command redefines itself after the first use, so as not to
@@ -2932,22 +3025,37 @@
execute the check every time.
The \refc{pr} command is also a font shortcut, but in addition takes optional
-parenthesis-delimited arguments, which are set in math mode:
+parenthesis-delimited arguments, which are set in math mode. To avoid
+erroneousy slurping up following parentheticals, there should be no space
+separating the command and its optional argument. With current versions of
+\pkg[https://ctan.org/pkg/xparse]{xparse}, this can be achieved with the
+\verb|!| argument type, but for compatibility with older \TeX\ distributions,
+I'll deal with it ``manually.''
\begin{source}
\cs_new:Nn \@@_fmt_pr:n {
\textnormal{\prfont{ #1 }}
}
-\cs_new:Nn \@@_fmt_pr:nn {
- \@@_fmt_pr:n { #1 }
- \ensuremath{ ( #2 ) }
+
+\NewDocumentCommand \@@_parse_paren_args { +d() } {
+ \IfNoValueF { #1 } {
+ \ensuremath{ ( #1 ) }
+ }
}
-\@@_new_cmd:Nnn \pr { m !+d() } {
- \IfNoValueTF { #2 } {
- \@@_fmt_pr:n { #1 }
+
+\NewDocumentCommand \@@_parse_bracket_or_paren_args { +o } {
+ \IfNoValueTF { #1 } {
+ \@@_parse_paren_args
} {
- \@@_fmt_pr:nn { #1 } { #2 }
+ \ensuremath{ [ #1 ] }
}
}
+
+\@@_new_cmd:Nnn \pr { m } {
+ \@@_fmt_pr:n { #1 }
+ \peek_catcode:NTF { ~ } { } {
+ \@@_parse_paren_args
+ }
+}
\end{source}
The \refc{fn} command is similar, but alternatively permits arguments in
square brackets.
@@ -2955,26 +3063,10 @@
\cs_new:Nn \@@_fmt_fn:n {
\textnormal{\fnfont{ #1 }}
}
-\cs_new:Nn \@@_fmt_fn:nn {
+\@@_new_cmd:Nnn \fn { m } {
\@@_fmt_fn:n { #1 }
- \ensuremath{ ( #2 ) }
-}
-\cs_new:Nn \@@_fmt_ar:nn {
- \@@_fmt_fn:n { #1 }
- \ensuremath{ [ #2 ] }
-}
-\@@_new_cmd:Nnn \fn { m !+o !+d() } {
- \IfNoValueTF { #2 } {
- \IfNoValueTF { #3 } {
- \@@_fmt_fn:n { #1 }
- } {
- \@@_fmt_fn:nn { #1 } { #3 }
- }
- } {
- \@@_fmt_ar:nn { #1 } { #2 }
- \IfNoValueF { #3 } {
- ( #3 )
- }
+ \peek_catcode:NTF { ~ } { } {
+ \@@_parse_bracket_or_paren_args
}
}
\end{source}
@@ -2983,10 +3075,12 @@
expandable in order to insert the multicolumn, the final, parenthesis-enclosed
argument can not be optional (unlike for \refc{pr}).
\begin{source}
-\@@_new_ecmd:Nnn \hd { m +r() } {
+% \@@_new_ecmd:Nnn \hd { m +r() } {
+% Now uses \def syntax:
+\@@_new_ecmd:Nnn \hd { #1 ( #2 ) } {
\multicolumn{2}
{\@@_hd_preamble}
- {\@@_fmt_pr:nn{#1}{#2}}
+ {\@@_fmt_pr:n{#1}\ensuremath{(#2)}}
}
\end{source}
Finally, \refc{st} and \refc{ct} add quotes and comment delimiters,
@@ -3003,7 +3097,9 @@
\end{source}
Beyond text styling, we also have styling for entire rows, i.e., highlighting:
\begin{source}
-\NewExpandableDocumentCommand \pseudohl { } {
+% \NewExpandableDocumentCommand \pseudohl { } {
+% For backward compatibility:
+\def \pseudohl {
\rowcolor{\pseudohlcolor}
}
\end{source}
@@ -3045,7 +3141,9 @@
\tex_mskip:D \l_tmpa_muskip
\box_use:N \l_tmpa_box
\tex_mskip:D \l_tmpb_muskip
- \box_use_drop:N \l_tmpa_box
+ % \box_use_drop:N \l_tmpa_box
+ % Replaced for compatibility
+ \box \l_tmpa_box
\tex_mskip:D \l_tmpa_muskip
}
\group_end:
@@ -3154,7 +3252,7 @@
ref .default:n = \l_@@_label_tl,
indent-length .tl_set:N = \l_@@_indent_length_tl,
- indent-length .initial:V = \c_novalue_tl,
+ indent-length .initial:V = \q_no_value,
indent-text .tl_set:N = \l_@@_indent_text_tl,
indent-text .initial:n = { \pseudofont\kw{else}\ },
@@ -3373,22 +3471,65 @@
\msg_new:nnn { pseudo } { unknown-key } {
Unknown~key~'#1'~ignored.
}
+
+\tl_new:N \l_@@_overlay_tl
+
\keys_define:nn { pseudo } {
unknown .code:n = {
- \tl_set_eq:NN \l_tmpa_tl \l_keys_key_tl
- \regex_extract_once:nVNTF {\A (.*) < (.*) > \Z}
- \l_tmpa_tl \l_tmpa_seq {
- \seq_pop_right:NN \l_tmpa_seq \l_tmpb_tl
- \seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
+
+ \group_begin:
+
+ \tl_map_inline:Nn \l_keys_key_tl {
+
+ \tl_if_eq:nnTF { ##1 } { < } {
+
+ \int_incr:N \l_tmpa_int
+ \int_compare:nF { \l_tmpb_int == 0 } {
+ % We already found `>'!
+ % Increment again to prevent match:
+ \int_incr:N \l_tmpa_int
+ }
+
+ \tl_set_eq:NN \l_tmpb_tl \l_tmpa_tl
+ \tl_clear:N \l_tmpa_tl
+
+ } {
+
+ \tl_if_eq:nnTF { ##1 } { > } {
+
+ \int_incr:N \l_tmpb_int
+
+ \tl_set_eq:NN \l_@@_overlay_tl \l_tmpa_tl
+ \tl_clear:N \l_tmpa_tl
+
+ } {
+
+ \tl_put_right:Nn \l_tmpa_tl { ##1 }
+
+ } }
+
+ }
+
+ % A single `<' and a final, single `>'?
+ \bool_if:nTF {
+ \int_compare_p:n { \l_tmpa_int == \l_tmpb_int == 1 }
+ &&
+ \tl_if_empty_p:N \l_tmpa_tl
+ }{
+ % Match
\tl_if_blank:nF{#1} {
- \tl_put_right:Nn \l_tmpa_tl {= #1}
+ \tl_put_right:Nn \l_tmpb_tl {= #1}
}
\@@_keys_set_overlay:VnV
- \l_tmpb_tl { pseudo } \l_tmpa_tl
- }{
+ \l_@@_overlay_tl { pseudo } \l_tmpb_tl
+ } {
+ % No match
\msg_error:nnx
{ pseudo } { unknown-key } { \l_keys_path_tl }
}
+
+ \group_end:
+
}
}
\end{source}
@@ -3432,7 +3573,8 @@
If the user happens to dedent too much, we might as well be a bit forgiving,
and clamp the indent level to non-negative values:
\begin{source}
- \int_compare:nNnT \g_@@_indent_level_int > \c_zero_int {
+ % Not using \c_zero_int for compatibility
+ \int_compare:nNnT \g_@@_indent_level_int > 0 {
\int_gdecr:N \g_@@_indent_level_int
}
}
@@ -3469,7 +3611,7 @@
\tl_gset_eq:NN \g_@@_cur_prefix_tl \pseudoprefix
}
}
-\NewDocumentCommand \@@_eol_tail { !s d<> +O{ } } {
+\NewDocumentCommand \@@_eol_tail { s d<> +O{ } } {
\@@_eol_handle_args:nnn{#1}{#2}{#3}
\end{source}
A new line is begun only if we're not at the end of the (or, at least of
@@ -3563,7 +3705,7 @@
various macros already described.
\begin{source}
-\NewDocumentEnvironment { pseudo } { !+o !s d<> +O{ } } {
+\NewDocumentEnvironment { pseudo } { +o s d<> +O{ } } {
\group_begin:
@@ -3581,7 +3723,8 @@
}
\@@_set_indent_length:
- % If not manually set as compact/noncompact, set automatically:
+ % If not manually set as compact/noncompact,
+ % set automatically:
\bool_if:NF \l_@@_compact_def_bool {
\bool_set:Nn \l_@@_compact_bool {
\mode_if_horizontal_p: && \mode_if_inner_p:
Added: trunk/Master/texmf-dist/doc/latex/pseudo/test/pseudotest.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pseudo/test/pseudotest.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/pseudo/test/pseudotest.tex 2019-10-30 21:19:15 UTC (rev 52582)
@@ -0,0 +1,209 @@
+\documentclass[a4paper]{article}
+
+\def\id{my previous definition}
+
+\usepackage{pseudo}
+
+\title{Tests for the \textsf{pseudo} package}
+\author{Magnus Lie Hetland}
+
+\begin{document}
+\maketitle
+
+\noindent
+This document is an attempt to use the features of the \textsf{pseudo} package
+without any other dependencies (as opposed to the \textsf{pseudo}
+documentation), e.g., to determine whether it's usable with an older \TeX\
+distribution.
+
+\section*{Fonts and styling}
+
+The previous definition of \verb|\id| is: \id\\
+\let\id\pseudoid
+
+\bigskip
+\noindent
+\begin{tabular}{@{}ll@{}}
+\verb|\cmd| & \verb|\pseudocmd|\\
+\kw{while} & \pseudokw{while}\\
+\cn{false} & \pseudocn{false}\\
+\id{rank} & \pseudoid{rank}\\
+\st{Hello!} & \pseudost{Hello!}\\
+\pr{Euclid}(a b) & \pseudopr{Euclid}(a b)\\
+\fn{length}(A) & \pseudofn{length}(A)\\
+\fn{length}[A] & \pseudofn{length}[A]\\
+\ct{Important!} & \pseudoct{Important!}\\
+\end{tabular}
+
+{\pseudoset{
+ kwfont=KW:~,
+ cnfont=CN:~,
+ idfont=ID:~,
+ stfont=ST:~,
+ st-left=[,
+ st-right=],
+ prfont=PR:~,
+ fnfont=FN:~,
+ ctfont=CT:~,
+ ct-left=[,
+ ct-right=],
+}
+\bigskip
+\noindent
+\begin{tabular}{@{}ll@{}}
+\verb|\cmd| & \verb|\pseudocmd|\\
+\kw{while} & \pseudokw{while}\\
+\cn{false} & \pseudocn{false}\\
+\id{rank} & \pseudoid{rank}\\
+\st{Hello!} & \pseudost{Hello!}\\
+\pr{Euclid}(a b) & \pseudopr{Euclid}(a b)\\
+\fn{length}(A) & \pseudofn{length}(A)\\
+\fn{length}[A] & \pseudofn{length}[A]\\
+\ct{Important!} & \pseudoct{Important!}\\
+\end{tabular}}
+
+% The one on the line is ignored:
+\begin{pseudo}[hpad, dim-color=red, kw][dim-color=blue, dim]
+ foo \\[hl]
+ bar
+\end{pseudo}
+
+\noindent
+Should be \verb|\fn{test}[A]| followed by \verb|(B)| in normalfont:
+\fn{test}[A](B)
+
+\bigskip
+\noindent
+Should be \verb|\fn{test}(A)| followed by \verb|[B]| in normalfont:
+\fn{test}(A)[B]
+
+\section*{Declarations and definitions}
+
+\DeclarePseudoComment \Imp {Important!}
+\DeclarePseudoConstant \False {false}
+\DeclarePseudoFunction \Ln {length}
+\DeclarePseudoIdentifier \Rank {rank}
+\DeclarePseudoKeyword \While {while}
+\DeclarePseudoNormal \Error {halt with an error message}
+\DeclarePseudoProcedure \Euclid {Euclid}
+\DeclarePseudoString \Hello {Hello!}
+
+\begin{pseudo*}
+$x = y$ \qquad \Imp \\
+\False \\
+\Ln(A) or \Ln[A] \\
+\Rank \\
+\While \\
+\Error \\
+\Euclid(a, b) \\
+\Hello
+\end{pseudo*}
+
+\pseudodefinestyle{mystyle}{
+ font = \Large
+}
+
+\begin{pseudo*}[mystyle]
+Hello, world!
+\end{pseudo*}
+
+\section*{Notation}
+
+$A[1\..n] \== B[2\..n+1]$ \\
+$A[1\dts n] \eqs B[2\dts n+1]$ \\
+
+\noindent
+$\id{foo-bar:baz}$
+
+\noindent
+{\pseudoset{eqs-pad=10mu, eqs-scale=2, eqs-sep=5mu}$x\==y$}
+
+\begin{pseudo*}[kw]
+keyword \tn{normal} keyword \nf normal
+\end{pseudo*}
+
+\section*{Numbering and indentation}
+
+\begin{pseudo}[start=2, label=(\Roman*), label-align=l, ref=\Roman*]
+ one \\
+ two \label{linetwo} \\*
+? & three \\
+\end{pseudo}
+
+\begin{pseudo}*
+\hd{Header}(\id{args}) \\
+first line
+\end{pseudo}
+
+\noindent
+Reference to line~\ref{linetwo}.
+
+\begin{pseudo}[hpad=1cm, hsep=.1cm, indent-length=2cm, indent-level=1]
+A \\+
+B \\++
+C \\-
+D \\---
+E
+\end{pseudo}
+
+\begin{pseudo*}[indent-text={otherwise\ }]
+if this \\+
+ then that \\-
+otherwise something else
+\end{pseudo*}
+
+\section*{Layout}
+
+Here's a compact piece of pseudocode:
+\begin{pseudo*}[kw, compact]
+print \st{42}
+\end{pseudo*}
+
+\noindent
+Automatically compact:
+\fbox{\begin{pseudo*}
+In a box.
+\end{pseudo*}}
+
+\begin{pseudo}[left-margin=\parindent]
+indented
+\end{pseudo}
+
+\begin{pseudo}[line-height=2]
+lines \\
+far \\
+apart
+\end{pseudo}
+
+\begin{pseudo}[parskip=1cm, topsep=1cm, partopsep=1cm]
+custom parskip, topsep and partopsep
+\end{pseudo}
+
+\section*{Overlays etc.}
+
+Ignored outside \textsf{beamer}.
+
+\begin{pseudo}[pause, kwfont<3>=\nf, unknown<3>=42]
+ foo \\<2>
+ % bar \\ <3> % Dosn't work in older xparse versions
+ baz
+\end{pseudo}
+
+% Things that could also be tested:
+% begin-tabular
+% bol
+% bol-append
+% bol-prepend
+% eol
+% eol-append
+% eol-prepend
+% preamble
+% prefix
+% pseudoeq
+% pseudoslash
+% setup
+% setup-append
+% setup-prepend
+% starred
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/pseudo/test/pseudotest.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/pseudo/pseudo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pseudo/pseudo.sty 2019-10-30 21:19:01 UTC (rev 52581)
+++ trunk/Master/texmf-dist/tex/latex/pseudo/pseudo.sty 2019-10-30 21:19:15 UTC (rev 52582)
@@ -20,8 +20,8 @@
% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
% SOFTWARE.
%
-\def \pseudoversion {1.1.2}
-\def \pseudodate {2019-07-14}
+\def \pseudoversion {1.1.3}
+\def \pseudodate {2019/10/30}
\RequirePackage{expl3}
\ProvidesExplPackage
{pseudo}
@@ -42,10 +42,8 @@
\dim_new:N \pseudoindentlength
\int_new:N \g__pseudo_indent_level_int
\int_new:N \l__pseudo_initial_indent_level_int
-\cs_generate_variant:Nn \tl_if_novalue:nTF { VTF }
+\cs_generate_variant:Nn \quark_if_no_value:nTF { VTF }
\cs_generate_variant:Nn \tl_set:Nn { Ne }
-\cs_generate_variant:Nn \regex_extract_once:nnNTF { nVNTF }
-\cs_generate_variant:Nn \regex_match:nnF { neF }
\cs_new:Nn \__pseudo_undef_col:n {
\tl_set_eq:cN { NC at find@ \token_to_str:N #1 } \scan_stop:
}
@@ -56,18 +54,18 @@
\cs_new:Nn \__pseudo_meta_new_cmd:NNnn {
\tl_set:Nn \l_tmpa_tl {pseudo \cs_to_str:N #2}
\exp_args:Nc
- #1 \l_tmpa_tl {#3} {#4}
+ #1 \l_tmpa_tl #3 {#4}
\cs_if_free:NT #2 {\cs_gset_eq:Nc #2 \l_tmpa_tl}
}
\cs_new:Nn \__pseudo_new_cmd:Nnn {
\__pseudo_meta_new_cmd:NNnn
- \NewDocumentCommand #1 {#2} {
+ \NewDocumentCommand #1 {{#2}} {
#3
}
}
\cs_new:Nn \__pseudo_new_ecmd:Nnn {
\__pseudo_meta_new_cmd:NNnn
- \NewExpandableDocumentCommand #1 {#2} {
+ \def #1 {#2} {
#3
}
}
@@ -89,7 +87,7 @@
}
}
\cs_new:Nn \__pseudo_set_indent_length: {
- \tl_if_novalue:VTF \l__pseudo_indent_length_tl {
+ \quark_if_no_value:VTF \l__pseudo_indent_length_tl {
\hbox_set:Nn \l_tmpa_box { \l__pseudo_indent_text_tl }
\dim_set:Nn \pseudoindentlength { \box_wd:N \l_tmpa_box }
} {
@@ -152,53 +150,44 @@
\__pseudo_b_or_bx:
\cs_if_exist:NT \@defaultsubs {
\cs_gset_eq:NN \__pseudo_b_or_bx: \bfseries
- \group_insert_after:N \__pseudo_b_or_bx:
}
\group_end:
+ \__pseudo_b_or_bx:
}
\cs_new:Nn \__pseudo_fmt_pr:n {
\textnormal{\prfont{ #1 }}
}
-\cs_new:Nn \__pseudo_fmt_pr:nn {
- \__pseudo_fmt_pr:n { #1 }
- \ensuremath{ ( #2 ) }
+\NewDocumentCommand \__pseudo_parse_paren_args { +d() } {
+ \IfNoValueF { #1 } {
+ \ensuremath{ ( #1 ) }
+ }
}
-\__pseudo_new_cmd:Nnn \pr { m !+d() } {
- \IfNoValueTF { #2 } {
- \__pseudo_fmt_pr:n { #1 }
+\NewDocumentCommand \__pseudo_parse_bracket_or_paren_args { +o } {
+ \IfNoValueTF { #1 } {
+ \__pseudo_parse_paren_args
} {
- \__pseudo_fmt_pr:nn { #1 } { #2 }
+ \ensuremath{ [ #1 ] }
}
}
+\__pseudo_new_cmd:Nnn \pr { m } {
+ \__pseudo_fmt_pr:n { #1 }
+ \peek_catcode:NTF { ~ } { } {
+ \__pseudo_parse_paren_args
+ }
+}
\cs_new:Nn \__pseudo_fmt_fn:n {
\textnormal{\fnfont{ #1 }}
}
-\cs_new:Nn \__pseudo_fmt_fn:nn {
+\__pseudo_new_cmd:Nnn \fn { m } {
\__pseudo_fmt_fn:n { #1 }
- \ensuremath{ ( #2 ) }
-}
-\cs_new:Nn \__pseudo_fmt_ar:nn {
- \__pseudo_fmt_fn:n { #1 }
- \ensuremath{ [ #2 ] }
-}
-\__pseudo_new_cmd:Nnn \fn { m !+o !+d() } {
- \IfNoValueTF { #2 } {
- \IfNoValueTF { #3 } {
- \__pseudo_fmt_fn:n { #1 }
- } {
- \__pseudo_fmt_fn:nn { #1 } { #3 }
- }
- } {
- \__pseudo_fmt_ar:nn { #1 } { #2 }
- \IfNoValueF { #3 } {
- ( #3 )
- }
+ \peek_catcode:NTF { ~ } { } {
+ \__pseudo_parse_bracket_or_paren_args
}
}
-\__pseudo_new_ecmd:Nnn \hd { m +r() } {
+\__pseudo_new_ecmd:Nnn \hd { #1 ( #2 ) } {
\multicolumn{2}
{\__pseudo_hd_preamble}
- {\__pseudo_fmt_pr:nn{#1}{#2}}
+ {\__pseudo_fmt_pr:n{#1}\ensuremath{(#2)}}
}
\__pseudo_new_cmd:Nnn \st { +m } {
\textnormal {
@@ -208,7 +197,7 @@
\textnormal {
\l__pseudo_ct_left_tl {\ctfont{#1}} \l__pseudo_ct_right_tl }
}
-\NewExpandableDocumentCommand \pseudohl { } {
+\def \pseudohl {
\rowcolor{\pseudohlcolor}
}
\__pseudo_new_dec:nn { Comment } { ct }
@@ -229,7 +218,7 @@
\tex_mskip:D \l_tmpa_muskip
\box_use:N \l_tmpa_box
\tex_mskip:D \l_tmpb_muskip
- \box_use_drop:N \l_tmpa_box
+ \box \l_tmpa_box
\tex_mskip:D \l_tmpa_muskip
}
\group_end:
@@ -281,7 +270,7 @@
ref .tl_set:N = \thepseudoline,
ref .default:n = \l__pseudo_label_tl,
indent-length .tl_set:N = \l__pseudo_indent_length_tl,
- indent-length .initial:V = \c_novalue_tl,
+ indent-length .initial:V = \q_no_value,
indent-text .tl_set:N = \l__pseudo_indent_text_tl,
indent-text .initial:n = { \pseudofont\kw{else}\ },
indent-level .int_set:N = \l__pseudo_initial_indent_level_int,
@@ -408,22 +397,42 @@
\msg_new:nnn { pseudo } { unknown-key } {
Unknown~key~'#1'~ignored.
}
+\tl_new:N \l__pseudo_overlay_tl
\keys_define:nn { pseudo } {
unknown .code:n = {
- \tl_set_eq:NN \l_tmpa_tl \l_keys_key_tl
- \regex_extract_once:nVNTF {\A (.*) < (.*) > \Z}
- \l_tmpa_tl \l_tmpa_seq {
- \seq_pop_right:NN \l_tmpa_seq \l_tmpb_tl
- \seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
+ \group_begin:
+ \tl_map_inline:Nn \l_keys_key_tl {
+ \tl_if_eq:nnTF { ##1 } { < } {
+ \int_incr:N \l_tmpa_int
+ \int_compare:nF { \l_tmpb_int == 0 } {
+ \int_incr:N \l_tmpa_int
+ }
+ \tl_set_eq:NN \l_tmpb_tl \l_tmpa_tl
+ \tl_clear:N \l_tmpa_tl
+ } {
+ \tl_if_eq:nnTF { ##1 } { > } {
+ \int_incr:N \l_tmpb_int
+ \tl_set_eq:NN \l__pseudo_overlay_tl \l_tmpa_tl
+ \tl_clear:N \l_tmpa_tl
+ } {
+ \tl_put_right:Nn \l_tmpa_tl { ##1 }
+ } }
+ }
+ \bool_if:nTF {
+ \int_compare_p:n { \l_tmpa_int == \l_tmpb_int == 1 }
+ &&
+ \tl_if_empty_p:N \l_tmpa_tl
+ }{
\tl_if_blank:nF{#1} {
- \tl_put_right:Nn \l_tmpa_tl {= #1}
+ \tl_put_right:Nn \l_tmpb_tl {= #1}
}
\__pseudo_keys_set_overlay:VnV
- \l_tmpb_tl { pseudo } \l_tmpa_tl
- }{
+ \l__pseudo_overlay_tl { pseudo } \l_tmpb_tl
+ } {
\msg_error:nnx
{ pseudo } { unknown-key } { \l_keys_path_tl }
}
+ \group_end:
}
}
\cs_new:Nn \__pseudo_set:n { \keys_set:nn { pseudo } { #1 } }
@@ -431,7 +440,7 @@
\int_gincr:N \g__pseudo_indent_level_int
}
\cs_new:Nn \__pseudo_dec_indent: {
- \int_compare:nNnT \g__pseudo_indent_level_int > \c_zero_int {
+ \int_compare:nNnT \g__pseudo_indent_level_int > 0 {
\int_gdecr:N \g__pseudo_indent_level_int
}
}
@@ -448,7 +457,7 @@
\tl_gset_eq:NN \g__pseudo_cur_prefix_tl \pseudoprefix
}
}
-\NewDocumentCommand \__pseudo_eol_tail { !s d<> +O{ } } {
+\NewDocumentCommand \__pseudo_eol_tail { s d<> +O{ } } {
\__pseudo_eol_handle_args:nnn{#1}{#2}{#3}
\peek_meaning_ignore_spaces:NF \end {
\pseudoeol
@@ -490,7 +499,7 @@
}
}
}
-\NewDocumentEnvironment { pseudo } { !+o !s d<> +O{ } } {
+\NewDocumentEnvironment { pseudo } { +o s d<> +O{ } } {
\group_begin:
\__pseudo_gsave_as:NN \\ \c__pseudo_saved_cr_cs
\__pseudo_gsave_as:NN \= \c__pseudo_saved_eq_cs
More information about the tex-live-commits
mailing list