diff options
Diffstat (limited to 'graphics/pgf/contrib')
54 files changed, 1923 insertions, 720 deletions
diff --git a/graphics/pgf/contrib/spectralsequences/README.md b/graphics/pgf/contrib/spectralsequences/README.md index 582a9c0804..808e9601f6 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/README.md +++ b/graphics/pgf/contrib/spectralsequences/README.md @@ -1,5 +1,5 @@ -spectralsequences v1.2.2 +spectralsequences v1.3.0 ======================== Author: Hood Chatham Email: hood@mit.edu @@ -13,7 +13,30 @@ Email me at hood@mit.edu to submit bug reports, request new features, etc. The c Changelog: ========== -## [1.2.2] (2018-02-18) +## [1.3.0] (2021-07-18) +### Added: +- Added more control over page indicator in title and "print page as" key. +- Added `page=\infty`. +- Added `\extension` and `\extensionoptions` +- Added `\replacestructlines` +- Added `range check off`, `range check on`, and `range check sideways` global + keys to control range checks. The `sideways` environment from `rotating` + environment automatically uses `range check sideways` (issue #11). + +### Fixed: +- Removed `\replaceclass` in `{sseqpage}` without `keep changes` error (suggested by Junhou Fung). +- Fixed `\doptions` and `\structlineoptions` so that they can be used to add an edge label -- `needs tikz` wasn't handled correctly (reported by idlaviV) +- Fixed title positioning when the `xrange` that doesn't start at 0 (reported by Robert Burklund) +- Fixed relative tikz coordinates (reported by Dexter Chua). +- Fixed foreach loops nested inside of plain tikz commands (e.g., `\draw (0,0) foreach \x in {1,2,3} {--(\x,\x)};`) +- Fixed `this page structlines` (reported by Irina Bobkova) +- Fixed `fit classes` to accomodate new version of `\tikz@calc@anchor` in tikz version 3.1.5 +- Fixed various other incompatiblities with latex3 with various versions of expl3. + +### Changed: +- \replaceclass now pushes the class replaced onto the stack. + +## [1.2.2] (2019-02-18) ### Fixed: - expl3 defined \exp_after:NNNf recently, so I changed \cs_new:Npn \exp_after:NNNf to \cs_set:Npn \exp_after:NNNf and copied the definition given by expl3. diff --git a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.pdf b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.pdf Binary files differindex 63b932aaa3..9a6315969f 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.tex b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.tex index 777a3303fa..777a3303fa 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf Binary files differindex 9423dd535a..99dee7163a 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.tex b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.tex index 3c8f3af0a7..3c8f3af0a7 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.pdf b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.pdf Binary files differindex 34323e4f33..3059187854 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.tex b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.tex index be6f88249f..be6f88249f 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.pdf b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.pdf Binary files differindex 88cd00c005..9a8b254a63 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.tex b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.tex index 4a79c6ebb6..4a79c6ebb6 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.pdf b/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.pdf Binary files differindex ba38e1dc08..31a8e047ab 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.tex b/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.tex index 14cd23fc47..14cd23fc47 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.pdf b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.pdf Binary files differindex 8769aa6c7e..061b8ce211 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.tex b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.tex index 0994d69f0f..0994d69f0f 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.pdf b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.pdf Binary files differindex 4fb86edd2a..45daac365d 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.tex b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.tex index a227184ea4..a227184ea4 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/HFPSS-KO.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.pdf b/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.pdf Binary files differindex b5729dae9a..b11be87272 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.tex b/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.tex index d71c48d808..46eb9d2c1b 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: example_endofVFoS.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).pdf b/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).pdf Binary files differindex 701b66fc36..974d19f301 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).tex b/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).tex index 43043f89b2..43043f89b2 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).tex +++ b/graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).pdf b/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).pdf Binary files differindex b145578082..396b65fbbb 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).tex b/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).tex index c2ce0a1d55..c2ce0a1d55 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).tex +++ b/graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.pdf b/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.pdf Binary files differindex bd14cc30b1..5129468ad7 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.tex b/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.tex index b326c2e996..b326c2e996 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.pdf b/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.pdf Binary files differindex d29570b7b8..2d0b0faa14 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.tex b/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.tex index 25c7143378..25c7143378 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/hatcher.pdf b/graphics/pgf/contrib/spectralsequences/examples/hatcher.pdf Binary files differindex 17c750ae63..65d283ebdd 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/hatcher.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/hatcher.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/hatcher.tex b/graphics/pgf/contrib/spectralsequences/examples/hatcher.tex index 3515aaacd0..5e8b4b67eb 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/hatcher.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/hatcher.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: example_hatcher.tex diff --git a/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.pdf b/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.pdf Binary files differindex 48a9746aa9..95318b3958 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.pdf +++ b/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.pdf diff --git a/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.tex b/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.tex index 7bd7350dd1..edda2cd39b 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.tex +++ b/graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: example_unstable_ASS_SO.tex diff --git a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-KORP8.tex b/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-KORP8.tex deleted file mode 100755 index f5a767b2de..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-KORP8.tex +++ /dev/null @@ -1,34 +0,0 @@ - - -\NewSseqCommand \KOstar {m}{ - \begin{scope}[ xshift = -#1, xshift = 8*\b, yshift = #1 ] - \class[rectangle, name = b^{\b}[0]](0,0) - \class[name = b^{\b} e[0]](1,0) \structline - \class[name = b^{\b} e^2[0]](2,0) \structline - \class[rectangle, fill = none, name = b^{\b} u[0]](4,0) - \end{scope} -} -\NewSseqCommand \KOpcell {m}{ - \d1(b^{\b}[#1]) \replacetarget - \d1(b^{\b} u[#1]) \replacetarget - \structline(b^{\b}[#1+1])(b^{\b} e[#1+1]) - \structline[page = 2, dashed](b^{\b} e[#1])(b^{\b} e^2[#1+1]) - \structline[page = 2, dashed](b^{\b} e^2[#1])(b^{\b} u[#1+1]) -} -\NewSseqCommand \KOetacell {m}{ - \DrawIfValidDifferential2(b^{\b}[#1]) - \d2(b^{\b} e[#1]) - \DrawIfValidDifferential3(b^{\b} e^2[#1]) -} -\begin{sseqdata}[ name = KO^*RP^8, Adams grading, class name handler = \SseqAHSSNameHandler, - classes = fill, x range = {-8}{10}, xscale = 0.7, yscale = 0.5, x tick step = 4 ] -\foreach \b in {-2,...,2}{ - \foreach \n in {0,...,6}{\KOstar{\n}} - \foreach \n in {1,3,...,5}{\KOpcell{\n}} - \foreach \n in {2,3}{\KOetacell{\n}} - \structline[dashed](b^{\b}e^2[2])(b^{\b}u[4]) - \structline[dashed](b^{\b}[4])(b^{\b}e[5]) -} -\end{sseqdata} -\printpage[ name = KO^*RP^8, title = AHSS for $KO^*\mathbb{R}P^8$ ] \vskip6pt -\printpage[ name = KO^*RP^8, page = 6 ]
\ No newline at end of file diff --git a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-class-page2a.tex b/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-class-page2a.tex deleted file mode 100755 index 90a9b9bc3c..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-class-page2a.tex +++ /dev/null @@ -1,24 +0,0 @@ -\begin{sseqdata}[ name = page_example2, Adams grading, xscale = 0.6, yscale = 0.5 ] -\class(0,2)\class(1,0) -\d2(1,0) -\replacesource -\class(0,3) -\d3(1,0) -\replacesource -\classoptions[fill, red](1,0) % (a) applies to most recent (last) generation. -\end{sseqdata} - -\printpage[ name = page_example2, page = 1 ] % generation 0 of (1,0), not styled -\quad -\begin{sseqpage}[ name = page_example2, page = 1, keep changes ] -\classoptions[fill, blue](1,0) % (b) applies to the generation present on page 1, that is, generation 0. -\end{sseqpage} \quad - -% generation 0 of (1,0), so class is blue from (b) -\printpage[ name = page_example2, page = 2 ] \quad - -% generation 1 of (1,0), class is not styled -\printpage[ name = page_example2, page = 3 ] \quad - -% generation 2 of (1,0), class is red from (a) -\printpage[ name = page_example2, page = 4 ]
\ No newline at end of file diff --git a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-class-page2b.tex b/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-class-page2b.tex deleted file mode 100755 index 3d5854f054..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-class-page2b.tex +++ /dev/null @@ -1,18 +0,0 @@ -\begin{sseqdata}[ name = page_example2, Adams grading, update existing ] -% (c) applies to all generations, overwrites (b) and (a): -\classoptions[fill, red, generation = 0 ---- -1](1,0) -\end{sseqdata} - -\printpage[ name = page_example2, page = 1 ]% generation 0 of (1,0), so class is red -\quad -\begin{sseqpage}[ name = page_example2, page = 1, keep changes ] -\classoptions[fill, blue](1,0) % (d) applies to the generation present on page 1, that is, generation 0. -\end{sseqpage} \quad - -% generation 0 of (1,0), class is blue from (d) -\printpage[ name = page_example2, page = 2 ] \quad - -% generation 1 of (1,0), class is red from (c) -\printpage[ name = page_example2, page = 3 ] -\quad -\printpage[ name = page_example2, page = 4 ] % generation 2 of (1,0), class is red from (c)
\ No newline at end of file diff --git a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-imJ.tex b/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-imJ.tex deleted file mode 100755 index 20335a33f2..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-imJ.tex +++ /dev/null @@ -1,32 +0,0 @@ -\SseqNewFamily{imJ} -\begin{sseqdata}[ - name=ANSS-S_2, Adams grading, - class labels = {below}, label distance = -1pt, - class placement transform = {rotate = 90, scale = 2}, - differentials = blue, - x range = {0}{9}, y range = {0}{4}, - xscale = 0.7, grid = go -] -% Image of J classes -\begin{scope}[imJ] -\class[rectangle,fill,inner sep=3pt](0,0) -\DoUntilOutOfBoundsThenNMore{3}{\etaclass} -\classoptions["\alpha_1" above left](1,1) -\class["\alpha_{2/2}", circlen = 2](3,1) -\structline(0,0) \structline[dashed](3,3) -\class["\alpha_3"](5,1) \d3\relax -\DoUntilOutOfBounds{ \etaclass \d3 } -\class["\alpha_{4/4}", rectangle, "16" {font = \tiny, inside}, inner sep = 1pt](7,1) -\DoUntilOutOfBoundsThenNMore{3}{\etaclass} -\end{scope} - -% Other classes -\class["\beta_{2/2}" {below right=-4pt}, insert = 1](6,2) -\structline(3,1) -\class["\beta_{2}" left](8,2) -\etaclass\structline(6,2,2) % This is a *nu -\end{sseqdata} - -\printpage[ name = ANSS-S_2, title = with image of J, imJ style = purple] - -\printpage[ name = ANSS-S_2, no imJ, x range={2}{9}, title = without image of J]
\ No newline at end of file diff --git a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-insert.tex b/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-insert.tex deleted file mode 100755 index 2784ca0d3c..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-insert.tex +++ /dev/null @@ -1,33 +0,0 @@ -\DeclareSseqGroup \tower {} { - \class(0,0) - \DoUntilOutOfBounds { - \class(\lastx,\lasty+1) - \structline - } -} - -\begin{sseqdata}[ name = insert-example, y range = {0}{4}, class pattern = linear ] -\tower(0,2) -\tower(0,3) -\tower(0,1) -\end{sseqdata} -\qquad -\begin{sseqpage}[ name = insert-example ] -\tower[ red, classes = { insert = 1 } ](0,0) -\end{sseqpage} -\qquad -\begin{sseqpage}[ name = insert-example ] -\tower[ red, classes = { insert = 2 } ](0,0) -\end{sseqpage} -\qquad -\begin{sseqpage}[ name = insert-example ] -\tower[ red, classes = { insert = 3 } ](0,0) -\end{sseqpage} -\qquad -\begin{sseqpage}[ name = insert-example ] -\tower[ red, classes = { insert = -2 } ](0,0) -\end{sseqpage} -\qquad -\begin{sseqpage}[ name = insert-example ] -\tower[ red, classes = { insert = -3 } ](0,0) -\end{sseqpage}
\ No newline at end of file diff --git a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-tikz.tex b/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-tikz.tex deleted file mode 100755 index d12a0c0242..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/examples/spectralsequencesmanual-tikz.tex +++ /dev/null @@ -1,25 +0,0 @@ -\begin{sseqdata}[ name = tikz example, Adams grading, math nodes = false, - tikz primitives = { blue, font = \tiny, <- }, circle classes = tikz primitive style, - x range = {0}{2}, x axis extend end = 2em ] -\class(0,0) -\class(1,0) -\class(0,2) -\d2(1,0) -\end{sseqdata} -% -\begin{sseqpage}[ name = tikz example ] -\circleclasses[ name path = myellipse, inner sep = 3pt, ellipse ratio = 1.6 ] (1,0) (0,2) -\path[ name path = myline ] (1.3,1.25) -- (0.6,1); -\draw[ name intersections = { of = myellipse and myline } ] - (intersection-1) to (1.3,1.25) node[ right, text width = 1.6cm ] {Consider this differential}; -\end{sseqpage} \qquad -% -\begin{sseqpage}[ name = tikz example ] -\draw[ xshift = 1 ] (0,0) to (0.6,0.2) node[ right, text width = 1.1cm ] {This is the source}; -\draw[ yshift = 2 ] (0,0) to (0.6,0.2) node[ right, text width = 1.1cm ] {This is the target}; -\end{sseqpage} \qquad -% -\begin{sseqpage}[ page = 3, name = tikz example ] -\circleclasses[ inner sep = 3pt, ellipse ratio = 1.6 ] (1,0)(0,2) -\node[ right, font = \tiny ] at (1.2,1.2) {Now it's gone!}; -\end{sseqpage}
\ No newline at end of file diff --git a/graphics/pgf/contrib/spectralsequences/manual/pgfmanual-en-macros.tex b/graphics/pgf/contrib/spectralsequences/manual/pgfmanual-en-macros.tex index ab7022b1e4..ab7022b1e4 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/manual/pgfmanual-en-macros.tex +++ b/graphics/pgf/contrib/spectralsequences/manual/pgfmanual-en-macros.tex diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.pdf b/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.pdf Binary files differdeleted file mode 100755 index 054c2d2347..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.pdf +++ /dev/null diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.tex b/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.tex index ab2722bd55..ab2722bd55 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.tex +++ b/graphics/pgf/contrib/spectralsequences/manual/spectralsequences-howitworks.tex diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-draftmode.pdf b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-draftmode.pdf Binary files differdeleted file mode 100755 index f517d3ad93..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-draftmode.pdf +++ /dev/null diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-layoutcharts.tex b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-layoutcharts.tex index 480f7559c4..480f7559c4 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-layoutcharts.tex +++ b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual-layoutcharts.tex diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.pdf b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.pdf Binary files differindex d5cbde1a3c..d696d5a4b9 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.pdf +++ b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.pdf diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.tex b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.tex index 4681bd03df..8971d5e566 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.tex +++ b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: spectralsequencesmanual.tex @@ -21,7 +21,7 @@ % explain / cross reference examples folder? % \sseqlastlabel is not currently documented. % -\def\version{Version 1.2.2} +\def\version{Version 1.3.0} \input spectralsequencesmanualpreamble @@ -37,9 +37,31 @@ \begin{abstract} \noindent -The \sseqpages\ package is a specialized tool built on top of \pgfpkg/\tikzpkg\ for drawing spectral sequence charts. It provides a powerful, concise syntax for specifying the data of a spectral sequence, and then allows the user to print various pages of a spectral sequence, automatically choosing which subset of the classes, differentials, and structure lines to display on each page. It also handles most of the details of the layout. At the same time, \sseqpages\ is extremely flexible. It is closely integrated with \tikzpkg\ to ensure that users can take advantage of as much as possible of its expressive power. It is possible to turn off most of the automated layout features and draw replacements using \tikzpkg\ commands. \sseqpages\ also has a carefully designed error reporting system intended to ensure that it is as clear as possible what is going wrong. - -Many thanks to the authors of \tikzpkg\ for producing such a wonderful package with such thorough documentation. I would have needed to spend a lot more time reading the \tikzpkg\ code if the documentation weren't so excellent. I took ideas or code or both from \tikzcdpkg\ (part of the code for turning quotes into class or edge labels), \pgfplotspkg\ (axes labels), and \sseqpkg\ (the grid types, the stack). I lifted a fair amount of code from \TeX stack exchange. Thanks to Eva Belmont for tons of helpful suggestions, bug reports, and productive conversations. Talking to her has helped to clarify many design concepts for the package. Thanks to Eric Peterson for being a very early adopter and reporting many bugs. Also thanks to all my friends, family, and acquaintances listened to me talk about \LaTeX\ programming even though they probably found it dreadfully boring. +The \sseqpages\ package is a specialized tool built on top of \pgfpkg/\tikzpkg\ +for drawing spectral sequence charts. It provides a powerful, concise syntax for +specifying the data of a spectral sequence, and then allows the user to print +various pages of a spectral sequence, automatically choosing which subset of the +classes, differentials, structure lines, and extensions to display on each page. +It also handles most of the details of the layout. At the same time, \sseqpages\ +is extremely flexible. It is closely integrated with \tikzpkg\ to ensure that +users can take advantage of as much as possible of its expressive power. It is +possible to turn off most of the automated layout features and draw replacements +using \tikzpkg\ commands. \sseqpages\ also has a carefully designed error +reporting system intended to ensure that it is as clear as possible what is +going wrong. + +Many thanks to the authors of \tikzpkg\ for producing such a wonderful package +with such thorough documentation. I would have needed to spend a lot more time +reading the \tikzpkg\ code if the documentation weren't so excellent. I took +ideas or code or both from \tikzcdpkg\ (part of the code for turning quotes into +class or edge labels), \pgfplotspkg\ (axes labels), and \sseqpkg\ (the grid +types, the stack). I lifted a fair amount of code from \TeX stack exchange. +Thanks to Eva Belmont for tons of helpful suggestions, bug reports, and +productive conversations. Talking to her has helped to clarify many design +concepts for the package. Thanks to Eric Peterson for being a very early adopter +and reporting many bugs. Also thanks to all my friends, family, and +acquaintances listened to me talk about \LaTeX\ programming even though they +probably found it dreadfully boring. \end{abstract} \end{titlepage} @@ -50,7 +72,11 @@ Many thanks to the authors of \tikzpkg\ for producing such a wonderful package \tableofcontents \newpage \section{Introduction} -The \sseqpages\ package consists of two main environments -- the \sseqdataenv\ environment, which specifies the data for a named spectral sequence, and the \sseqpageenv\ environment, which prints a single page of a spectral sequence. The |\printpage| command is also available as a synonym for a \sseqpageenv\ environment with an empty body. +The \sseqpages\ package consists of two main environments -- the \sseqdataenv\ +environment, which specifies the data for a named spectral sequence, and the +\sseqpageenv\ environment, which prints a single page of a spectral sequence. +The |\printpage| command is also available as a synonym for a \sseqpageenv\ +environment with an empty body. Here is a basic example: \begin{codeexample}[width = 8.7cm] @@ -65,21 +91,58 @@ Here is a basic example: \printpage[ name = basic, page = 3 ] \quad \printpage[ name = basic, page = 4 ] \end{codeexample} -\codeverb|\begin{sseqdata}[name = basic, cohomological Serre grading]| starts the declaration of the data of a spectral sequence named |basic| with cohomological Serre grading -- that is, the page $\mathtt{r}$ differentials go $\mathtt{r}$ to the right and down $\mathtt{r-1}$. Then we specify four classes and one page 3 differential, and we ask \sseqpages\ to print the third and fourth pages of the spectral sequence. Note that on the fourth page, the source and target of the differential have disappeared. +\codeverb|\begin{sseqdata}[name = basic, cohomological Serre grading]| starts +the declaration of the data of a spectral sequence named |basic| with +cohomological Serre grading -- that is, the page $\mathtt{r}$ differentials go +$\mathtt{r}$ to the right and down $\mathtt{r-1}$. Then we specify four classes +and one page 3 differential, and we ask \sseqpages\ to print the third and +fourth pages of the spectral sequence. Note that on the fourth page, the source +and target of the differential have disappeared. \subsection{Installation} -In both \miktex\ and \texlive\ installation should be automatic -- your \TeX\ distribution should automatically install the package the first time you include |\usepackage{spectralsequences}| in a document and compile it. However, in 2016, \texlive\ made an incompatible change to their database, so no new packages will run on versions of \texlive\ from before 2016. This includes \sseqpages. If you have an old version of \texlive, you can either perform a manual install, -or, better, you should install an up to date version of \texlive. If you want to do a manual install, see \href{https://tex.stackexchange.com/a/73017}{this \TeX stack exchange post} for instructions. +In both \miktex\ and \texlive\ installation should be automatic -- your \TeX\ +distribution should automatically install the package the first time you include +|\usepackage{spectralsequences}| in a document and compile it. However, in 2016, +\texlive\ made an incompatible change to their database, so no new packages will +run on versions of \texlive\ from before 2016. This includes \sseqpages. If you +have an old version of \texlive, you can either perform a manual install, or, +better, you should install an up to date version of \texlive. If you want to do +a manual install, see \href{https://tex.stackexchange.com/a/73017}{this \TeX +stack exchange post} for instructions. \subsection{Memory Constraints} -In a default \TeX\ install, \pdfLaTeX\ has small static memory caps that prevent it from using more than about 60 megabytes of total ram. However, \spectralsequences\ and \pgfpkg/\tikzpkg\ use a large amount of memory. For this reason, using \pdfLaTeX\ with a default install, you cannot draw more than about 2500 classes across all of your diagrams (fewer if you include differentials, structure lines, and other features). There are a few solutions to this. - -The easiest solution is to run \LuaLaTeX. \LuaLaTeX\ dynamically allocates memory and so is unlikely to run out of it. Using \LuaLaTeX\ on my computer, I can compile a document that draws two copies of a diagram with 20,000 classes in it (so a total of 40,000 classes). This takes about 50 seconds and 250 megabytes of ram. I expect any real-world use case will compile fine on a modern computer using \LuaLaTeX. This option has the advantage that any modern \TeX\ install comes with a copy of \LuaLaTeX, and that \LuaLaTeX\ is the designated successor to \pdfLaTeX. It has the disadvantage that there are some incompatibilities between \LuaLaTeX\ and \pdfLaTeX\ so if your document depends on \pdfLaTeX-specific features, it might be a pain to switch to \LuaLaTeX. - -Another option is to increase the static memory caps for \pdfLaTeX. See \href{https://tex.stackexchange.com/a/26213}{this \TeX stack exchange post} for instructions on how to do this. - -\subsection{A warning about fragile macros} -All the data in a \sseqpages\ environment is stored and used later. As a result, most of the \sseqpages\ commands currently cannot tolerate fragile macros. Unfortunately, it is impossible for \sseqpages\ to warn you about this situation -- if you use a fragile command in a place that it doesn't belong, the result will be an incomprehensible error message. If you are getting nonsense error messages, this might be why. The solution is to convert fragile macros into robust ones. Common examples of fragile macros include |\widehat| and |\underline|. My suggested solution to this is to add the following code to your preamble for each fragile macro (example given for |\mathbb|): +In a default \TeX\ install, \pdfLaTeX\ has small static memory caps that prevent +it from using more than about 60 megabytes of total ram. However, +\spectralsequences\ and \pgfpkg/\tikzpkg\ use a large amount of memory. For this +reason, using \pdfLaTeX\ with a default install, you cannot draw more than about +2500 classes across all of your diagrams (fewer if you include differentials, +structure lines, and other features). There are a few solutions to this. + +The easiest solution is to run \LuaLaTeX. \LuaLaTeX\ dynamically allocates +memory and so is unlikely to run out of it. Using \LuaLaTeX\ on my computer, I +can compile a document that draws two copies of a diagram with 20,000 classes in +it (so a total of 40,000 classes). This takes about 50 seconds and 250 megabytes +of ram. I expect any real-world use case will compile fine on a modern computer +using \LuaLaTeX. This option has the advantage that any modern \TeX\ install +comes with a copy of \LuaLaTeX, and that \LuaLaTeX\ is the designated successor +to \pdfLaTeX. It has the disadvantage that there are some incompatibilities +between \LuaLaTeX\ and \pdfLaTeX\ so if your document depends on +\pdfLaTeX-specific features, it might be a pain to switch to \LuaLaTeX. + +Another option is to increase the static memory caps for \pdfLaTeX. See +\href{https://tex.stackexchange.com/a/26213}{this \TeX stack exchange post} for +instructions on how to do this. + +\subsection{A warning about fragile macros}% +All the data in a \sseqpages\ environment is stored and used later. As a +result, most of the \sseqpages\ commands currently cannot tolerate fragile +macros. Unfortunately, it is impossible for \sseqpages\ to warn you about this +situation -- if you use a fragile command in a place that it doesn't belong, the +result will be an incomprehensible error message. If you are getting nonsense +error messages, this might be why. The solution is to convert fragile macros +into robust ones. Common examples of fragile macros include |\widehat| and +|\underline|. My suggested solution to this is to add the following code to your +preamble for each fragile macro (example given for |\mathbb|): \begin{codeexample}[code only] \let\oldwidehat\widehat \protected\def\widehat{\oldwidehat} @@ -87,26 +150,45 @@ All the data in a \sseqpages\ environment is stored and used later. As a result \section{Package Options and Environments} -\begin{manualentry}{Draft Mode} -The drawings that \sseqpages\ produces can be quite slow, especially if they are large. Draft mode skips drawing the content of the spectral sequence, but still takes up exactly the same amount of space in the document, so that you can deal with formatting issues. To active draft mode, load the package by saying |\usepackage[draft]{spectralsequences}|. +\begin{manualentry}{Draft Mode}% +The drawings that \sseqpages\ produces can be quite slow, especially if they are +large. Draft mode skips drawing the content of the spectral sequence, but still +takes up exactly the same amount of space in the document, so that you can deal +with formatting issues. To active draft mode, load the package by saying +|\usepackage[draft]{spectralsequences}|. \end{manualentry} -\begin{environment}{{sseqdata}\moptions} -The \sseqdataenv\ environment is for storing a spectral sequence to be printed later. This environment is intended for circumstances where you want to print multiple pages of the same spectral sequence. When using the \sseqdataenv\ environment, you must use the |name| option to tell \sseqpages\ where to store the spectral sequence so that you can access it later. +\begin{environment}{{sseqdata}\moptions}% +The \sseqdataenv\ environment is for storing a spectral sequence to be printed +later. This environment is intended for circumstances where you want to print +multiple pages of the same spectral sequence. When using the \sseqdataenv\ +environment, you must use the |name| option to tell \sseqpages\ where to store +the spectral sequence so that you can access it later. \end{environment} -\begin{environment}{{sseqpage}\ooptions} -This environment is used for printing a page of existing spectral sequence that was already specified using the \sseqdataenv\ environment. The body of the environment adds local changes -- classes, differentials, structure lines, and arbitrary \tikzpkg\ options that are by default only printed on this particular page. The \sseqpageenv\ environment can also be used to print a stand-alone page of a spectral sequence -- that is, if you only want to print a single page of the spectral sequence, you can skip using the \sseqdataenv\ environment. +\begin{environment}{{sseqpage}\ooptions}% +This environment is used for printing a page of existing spectral sequence that +was already specified using the \sseqdataenv\ environment. The body of the +environment adds local changes -- classes, differentials, structure lines, +extensions, and arbitrary \tikzpkg\ options that are by default only printed on +this particular page. The \sseqpageenv\ environment can also be used to print a +stand-alone page of a spectral sequence -- that is, if you only want to print a +single page of the spectral sequence, you can skip using the \sseqdataenv\ +environment. \end{environment} -\begin{command}{\printpage\moptions} -This command prints a single page of an existing spectral sequence as-is. This is equivalent to a \sseqpageenv\ environment with an empty body. +\begin{command}{\printpage\moptions}% +This command prints a single page of an existing spectral sequence as-is. This +is equivalent to a \sseqpageenv\ environment with an empty body. \end{command} \section{The Main Commands} -\begin{command}{\class\ooptions\parargtwo{x}{y}} -This places a class at |(x,y)| where |x| and |y| are integers. If multiple classes occur at the same position, \sseqpages\ will automatically arrange them in a pre-specified pattern. This pattern may be altered using the |class pattern| option. +\begin{command}{\class\ooptions\parargtwo{x}{y}}% +This places a class at |(x,y)| where |x| and |y| are integers. If multiple +classes occur at the same position, \sseqpages\ will automatically arrange them +in a pre-specified pattern. This pattern may be altered using the% +|class pattern| option. \begin{codeexample}[] \begin{sseqpage}[ no axes, ymirror, yscale = 0.8 ] \class(0,0) @@ -118,9 +200,13 @@ This places a class at |(x,y)| where |x| and |y| are integers. If multiple class \end{sseqpage} \end{codeexample} -The effect of the |\class| command is to print a \tikzpkg\ node on a range of pages. Any option that would work for a \tikzpkg\ |\node| command will also work in the same way for the |\class|, |\replaceclass|, and |\classoptions| commands. +The effect of the |\class| command is to print a \tikzpkg\ node on a range of +pages. Any option that would work for a \tikzpkg\ |\node| command will also work +in the same way for the |\class|, |\replaceclass|, and |\classoptions| commands. -If a class is the source or the target of a differential on a certain page, then the page of the class is set to that page, and the class is only rendered on pages up to that number: +If a class is the source or the target of a differential on a certain page, then +the page of the class is set to that page, and the class is only rendered on +pages up to that number: \begin{codeexample}[width = 8cm] \begin{sseqdata}[ name = class example, Adams grading, @@ -135,11 +221,21 @@ If a class is the source or the target of a differential on a certain page, then \printpage[ name = class example, page = 3 ] \end{codeexample} -See the \pgfmanualpdfref{class options}{class options} section for a list of the sort of options available for classes. +See the \pgfmanualpdfref{class options}{class options} section for a list of the +sort of options available for classes. \end{command} -\begin{commandlist}{{\replaceclass\ooptions\parargthreeopt{x}{y}{n}},\replaceclass\ooptions\pararg{classname}, \replacesource\ooptions, \replacetarget\ooptions} -After a class is the source or target of a differential, it disappears on the next page. However, some differentials are not injective or not surjective. Using the command |\replaceclass| causes a new symbol to appear on the page after a class supported or accepted a differential (or both). If there are multiple classes at the coordinate |(x,y)| you may specify which using an integer or a |tag| $n$. By default, this command will affect the first class placed in that position. You can also provide the |class:name| of a class. The variants |\replacesource| and |\replacetarget| replace the source and target respectively of the most recent differential. +\begin{commandlist}{{\replaceclass\ooptions\parargthreeopt{x}{y}{n}},\replaceclass\ooptions\pararg{classname}, +\replacesource\ooptions, \replacetarget\ooptions}% +After a class is the source or target of a differential, it disappears on the +next page. However, some differentials are not injective or not surjective. +Using the command |\replaceclass| causes a new symbol to appear on the page +after a class supported or accepted a differential (or both). If there are +multiple classes at the coordinate |(x,y)| you may specify which using an +integer or a |tag| $n$. By default, this command will affect the first class +placed in that position. You can also provide the |class:name| of a class. The +variants |\replacesource| and |\replacetarget| replace the source and target +respectively of the most recent differential. \begin{codeexample}[] \begin{sseqdata}[name = replace class example, Adams grading, classes = {draw = none } ] \class["\mathbb{Z}"](0,3) @@ -154,13 +250,38 @@ After a class is the source or target of a differential, it disappears on the ne \printpage[ name = replace class example, page = 3 ] \qquad \printpage[ name = replace class example, page = 4 ] \end{codeexample} -Note that this will not restore any structure lines coming into or off of the class, if you want the structure lines to persist, you must call |\structline| again (or use the |structline:page| option). +Note that this will not restore any structure lines coming into or off of the +class. If you want to restore all structlines on the class use +|\replacestructlines|. If you want to selectively replace some of the structure +lines, you must use |\structline| again (or use the |structline:page| option). \end{commandlist} -\begin{commandlist}{{\classoptions\moptions\parargthreeopt{x}{y}{n}},\classoptions\moptions\pararg{classname}, \classoptions\moptions} -This adds options to an existing class. This can be used in a \sseqpageenv\ environment to modify the appearance of a class for just one drawing of the spectral sequence, for instance to highlight it for discussion purposes. +\begin{command}{\replacestructlines\opt{\pars{\sourcecoord}}}% +This command replaces all structlines touching a class that has been +replaced using |\replaceclass|, |\replacesource|, or |\replacetarget|. +\begin{codeexample}[] +\begin{sseqdata}[name=replacestructlines] +\class(0,1) +\class(0,2) +\structline +\class(1,0) +\d2(1,0)(0,2) +\replacetarget\replacestructlines +\end{sseqdata} +\printpage[name=replacestructlines, page=3] +\end{codeexample} +\end{command} + +\begin{commandlist}{{\classoptions\moptions\parargthreeopt{x}{y}{n}},\classoptions\moptions\pararg{classname}, +\classoptions\moptions}% +This adds options to an existing class. This can be used in a \sseqpageenv\ +environment to modify the appearance of a class for just one drawing of the +spectral sequence, for instance to highlight it for discussion purposes. -If there are multiple classes at the coordinate |(x,y)| you may specify which using an integer or a |tag| $n$. By default, this command will affect the first class placed in that position. You can also provide the |class:name| of a class. If no coordinate is indicated at all, then |\lastclass| is used. +If there are multiple classes at the coordinate |(x,y)| you may specify which +using an integer or a |tag| $n$. By default, this command will affect the first +class placed in that position. You can also provide the |class:name| of a class. +If no coordinate is indicated at all, then |\lastclass| is used. \begin{codeexample}[width = 6cm] \begin{sseqdata}[ name = class options example, classes = fill ] @@ -176,7 +297,8 @@ If there are multiple classes at the coordinate |(x,y)| you may specify which us {\textup{The red class is the problem}}; \end{sseqpage} \end{codeexample} -Another reason to use this is to give a label to one instance of a class that shows up in a loop or a command defined using |\NewSseqGroup|: +Another reason to use this is to give a label to one instance of a class that +shows up in a loop or a command defined using |\NewSseqGroup|: \begin{codeexample}[width = 6cm] \NewSseqGroup\mygroup {} { \class(0,0) @@ -196,7 +318,8 @@ Another reason to use this is to give a label to one instance of a class that sh \classoptions["\eta"](1,1) \end{sseqpage} \end{codeexample} -See the \pgfmanualpdfref{class options}{class options} section for a list of the sort of options available for classes. +See the \pgfmanualpdfref{class options}{class options} section for a list of the +sort of options available for classes. \end{commandlist} \begin{commandlist}{ @@ -204,10 +327,27 @@ See the \pgfmanualpdfref{class options}{class options} section for a list of the {\d\ooptions\meta{page}\pars{\meta{x},\meta{y}\opt{,\sourcen,\targetn}}}, {\d\ooptions\meta{page}\pars{\sourcename\opt{,\targetn}}}, {\d\ooptions\meta{page}\pars{\sourcecoord}\pars{\targetcoord}}% -} -Calling |\d\meta{page}|\parargtwo{x}{y} creates a differential starting at \parargtwo{x}{y} of length determined by the specified page. In order to use the |\d| command like this, you must first specify the |degree| of the differentials as an option to the \sseqdataenv\ or \sseqpageenv\ environment. The degree indicates how far to the right and how far up a page $\mathtt{r}$ differential will go as a function of $\mathtt{r}$. If there is a page $\mathtt{r}$ differential, on page $\mathtt{r+1}$, the source, target, and any structure lines connected to the source and target of the differential disappear. If no class is specified, the default is to use |\lastclass|. - -If there are multiple nodes in the source or target, you may specify which one the differential should go to using an index or tag for \sourcen\ or \targetn. It is also possible to provide the name of the source coordinate and an optional target, or to separately provide the source and target coordinate, either as names or as \parargthree{x}{y}{n}. Using |\d| with explicit source and target coordinates works even if you did not provide a |degree| to the spectral sequence. If you did provide a |degree|, then \sseqpages\ will check whether the difference between the source and target is appropriate for a differential of a given page, and if not it will throw an error. If this is undesirable, you can use the |lax degree| option. +}% +Calling |\d\meta{page}|\parargtwo{x}{y} creates a differential starting at +\parargtwo{x}{y} of length determined by the specified page. In order to use the +|\d| command like this, you must first specify the |degree| of the differentials +as an option to the \sseqdataenv\ or \sseqpageenv\ environment. The degree +indicates how far to the right and how far up a page $\mathtt{r}$ differential +will go as a function of $\mathtt{r}$. If there is a page $\mathtt{r}$ +differential, on page $\mathtt{r+1}$, the source, target, and any structure +lines connected to the source and target of the differential disappear. If no +class is specified, the default is to use |\lastclass|. + +If there are multiple nodes in the source or target, you may specify which one +the differential should go to using an index or tag for \sourcen\ or \targetn. +It is also possible to provide the name of the source coordinate and an optional +target, or to separately provide the source and target coordinate, either as +names or as \parargthree{x}{y}{n}. Using |\d| with explicit source and target +coordinates works even if you did not provide a |degree| to the spectral +sequence. If you did provide a |degree|, then \sseqpages\ will check whether +the difference between the source and target is appropriate for a differential +of a given page, and if not it will throw an error. If this is undesirable, you +can use the |lax degree| option. \begin{codeexample}[width = 7.5cm] \begin{sseqdata}[ name = d example, degree = {-1}{#1}, struct lines = blue, yscale = 1.3 ] @@ -223,8 +363,11 @@ If there are multiple nodes in the source or target, you may specify which one t \printpage[ name = d example, page = 2 ] \quad \printpage[ name = d example, page = 3 ] \end{codeexample} -If there are multiple nodes in the source or target coordinate, then there is a funny syntax for indicating which one should be the source and target: +If there are multiple nodes in the source or target coordinate, then there is a +funny syntax for indicating which one should be the source and target: +\begin{center} |\d\meta{page}\pars{\meta{x},\meta{y}\opt{,\sourcen,\targetn}}| +\end{center} \begin{codeexample}[width = 7.5cm] \begin{sseqpage}[ Adams grading, yscale = 0.8 ] \class(1,0) \class(1,0) @@ -238,7 +381,9 @@ If there are multiple nodes in the source or target coordinate, then there is a \d2(3,0,,2) \end{sseqpage} \end{codeexample} -Negative indices will count from the most recent class in the coordinate (so the most recent is |-1|, the second most recent is |-2|, etc). You can also use a |tag|, which works better if the situation is complicated. +Negative indices will count from the most recent class in the coordinate (so the +most recent is |-1|, the second most recent is |-2|, etc). You can also use a +|tag|, which works better if the situation is complicated. \begin{codeexample}[width = 7.5cm] \begin{sseqpage}[ Adams grading, yscale = 0.65 ] \class(1,0) @@ -257,20 +402,43 @@ Negative indices will count from the most recent class in the coordinate (so the {\doptions\moptions\meta{page}\pars{\meta{x},\meta{y}\opt{,\sourcen,\targetn}}}, {\doptions\moptions\meta{page}\pars{\sourcename\opt{,\targetn}}}, {\doptions\moptions\meta{page}\pars{\sourcecoord}\pars{\targetcoord}}% -} -This command adds options to an existing differential, just like |\classoptions| except for differentials. Its syntax is identical to that of |\d|. +}% +This command adds options to an existing differential, just like |\classoptions| +except for differentials. Its syntax is identical to that of |\d|. \end{commandlist} -\begin{command}{\kill\meta{page}\oarg{coord}} -This command sets the indicated coordinate to die on the indicated page, but does not establish a target for the differential. This is useful if you want to draw your own differential using tikz (see |\getdtarget|) or if you are not drawing the class on the other side of the differential for clutter reasons. As usual, if no coordinate is provided, the default argument is |\lastclass|. +\begin{command}{\kill\meta{page}\oarg{coord}} This command sets the indicated +coordinate to die on the indicated page, but does not establish a target for the +differential. This is useful if you want to draw your own differential using +tikz (see |\getdtarget|) or if you are not drawing the class on the other side +of the differential for clutter reasons. As usual, if no coordinate is provided, +the default argument is |\lastclass|. \end{command} \begin{command}{\structline\ooptions\opt{\pars{\sourcecoord}\pars{\targetcoord}}} -This command creates a structure line from \sourcecoord\ to \targetcoord. The source and target coordinates are either of the form \pars{\meta{x},\meta{y}\opt{,\meta{n}}} or \pararg{class name}. If there are multiple classes at $\mathtt{(x,y)}$, then \meta{n} specifies which of the classes at $\mathtt{(x,y)}$ the structure line starts and ends at -- if n is positive, then it counts from the first class in that position, if n is negative, it counts backwards from the most recent. You can also use a |tag| for n. If the \targetcoord\ is omitted, then |\lastclass| is used, so that |\structline(\sourcecoord)| connects the most recent class to the specified coordinate. If both coordinates are omitted, then |\lastclass| and |\lastclass1| are used, and so |\structline| with no arguments at all will connect the two most recent classes. - -If the source or target of a structure line is hit by a differential, then on subsequent pages, the structure line disappears. - -If the source or target has had multiple generations (i.e., they got hit and you used |\replaceclass|), then the |\structline| will only appear starting on the first page where the current generation of both the source and target are present. If this is undesirable, you can use the |structline:page| option to change it. +The |\structline| command creates a structure line from \sourcecoord\ to +\targetcoord. The source and target coordinates are either of the form +\pars{\meta{x},\meta{y}\opt{,\meta{n}}} or \pararg{class name}. If there are +multiple classes at $\mathtt{(x,y)}$, then \meta{n} specifies which of the +classes at $\mathtt{(x,y)}$ the structure line starts and ends at -- if n is +positive, then it counts from the first class in that position, if n is +negative, it counts backwards from the most recent. You can also use a |tag| for +n. If the \targetcoord\ is omitted, then |\lastclass| is used, so that +|\structline(\sourcecoord)| connects the most recent class to the specified +coordinate. If both coordinates are omitted, then |\lastclass| and |\lastclass1| +are used, and so |\structline| with no arguments at all will connect the two +most recent classes. + +If the source or target of a structure line is hit by a differential, then on +subsequent pages, the structure line disappears. + +If the source or target has had multiple generations (i.e., they got hit and you +used |\replaceclass|), then the |\structline| will only appear starting on the +first page where the current generation of both the source and target are +present. If this is undesirable, you can use the |structline:page| option or the +to change it. Also, the structline will disppear the first time after this the +source or target has a differential, but this can be changed with the +|\replacestructlines| command. \begin{codeexample}[width = 7.5cm] \DeclareSseqGroup\tower {} { \class(0,0) @@ -299,24 +467,62 @@ If the source or target has had multiple generations (i.e., they got hit and you \end{command} \begin{command}{\structlineoptions\moptions\opt{\pars{\sourcecoord}\pars{\targetcoord}}} -This command adds options to an existing structure line, just like |\classoptions| except for structure lines. Its syntax is identical to |\structline|. +This command adds options to an existing structure line, just like +|\classoptions| except for structure lines. Its syntax is identical to +|\structline|. +\end{command} + +\begin{command}{\extension\ooptions\opt{\pars{\sourcecoord}\pars{\targetcoord}}} +The |\extension| command has an identical syntax to the |\structline| command +and most of the same options. Instead of adding a structline, it adds an +extension. The extensions are only shown on page $\infty$ or page ranges ending +at $\infty$. + +\begin{codeexample}[width = 7.5cm] +\begin{sseqdata}[ name = extension example, + classes = { circle, fill }, + Adams grading, no axes, + yscale = 1.28 ] +\class(0,0) \class(0,1) +\extension +\end{sseqdata} +\printpage[ name = extension example, page = 2 ] \quad +\printpage[ name = extension example, page = \infty ] +\end{codeexample} +\end{command} + +\begin{command}{\extensionoptions\moptions\opt{\pars{\sourcecoord}\pars{\targetcoord}}} +This command adds options to an existing extension. Its syntax is identical to +|\extension|. \end{command} \begin{command}{\circleclasses\ooptions\pars{\sourcecoord}\pars{\targetcoord}} -This command is a lot like |\structline| except that it puts a circle around the classes instead of connecting them with a line. It might take a certain amount of fiddling with options to get |\circleclasses| to produce good results. There is no |\circleclassesoptions| command because it doesn't seem necessary and (more importantly) I didn't feel like making one. Maybe someday I'll put one in. +This command is a lot like |\structline| except that it puts a circle around the +classes instead of connecting them with a line. It might take a certain amount +of fiddling with options to get |\circleclasses| to produce good results. There +is no |\circleclassesoptions| command because it doesn't seem necessary. \end{command} \begin{commandlist}{\draw,\path,\node,\clip} -Any code that would work in a \tikzpictureenv\ environment will also work unchanged in a \sseqdataenv\ or \sseqpageenv\ environment, with a few minor differences. This is a very flexible way to add arbitrary background or foreground features to the spectral sequence: +Any code that would work in a \tikzpictureenv\ environment will also work +unchanged in a \sseqdataenv\ or \sseqpageenv\ environment, with a few minor +differences. This is a very flexible way to add arbitrary background or +foreground features to the spectral sequence: \codeexample[from file=tikz] \end{commandlist} \section{Options for the main commands} \subsection{Universal options} -The following options work with all of the drawing commands in this package, including |\class|, |\d|, and |\structline|, their friends |\replaceclass|, |\classoptions|, |\doptions|, and |\structlines|, as well as with \tikzpkg\ primitives. +The following options work with all of the drawing commands in this package, +including |\class|, |\d|, and |\structline|, their friends |\replaceclass|, +|\classoptions|, |\doptions|, and |\replacestructlines|, as well as with \tikzpkg\ +primitives. \begin{keylist}{xshift = \meta{integer},yshift = \meta{integer}} -Shifts by integer values are the only coordinate changes that are allowed to be applied to |\class|, |\d|, |\structline|, their relatives, or to a \scopeenv\ environment that contains any of these commands. These shift commands help with reusing code. For instance: +Shifts by integer values are the only coordinate changes that are allowed to be +applied to |\class|, |\d|, |\structline|, their relatives, or to a \scopeenv\ +environment that contains any of these commands. These shift commands help with +reusing code. For instance: \begin{codeexample}[width = 6cm] \begin{sseqpage}[ cohomological Serre grading, yscale = 0.45 ] \foreach \x in {0,1} \foreach \y in {0,1} { @@ -328,7 +534,9 @@ Shifts by integer values are the only coordinate changes that are allowed to be } \end{sseqpage} \end{codeexample} -This code segment is very useful so \sseqpages\ has the command |\NewSseqGroup| which to make code like this more convenient. The following code produces the same output as above: +This code segment is very useful so \sseqpages\ has the command |\NewSseqGroup| +which to make code like this more convenient. The following code produces the +same output as above: \begin{codeexample}[code only,width = 6cm] \NewSseqGroup\examplegroup {} { \class(2,0) @@ -344,11 +552,20 @@ This code segment is very useful so \sseqpages\ has the command |\NewSseqGroup| \end{codeexample} -A word of warning: the behavior of |xshift| in \sseqpages\ is incompatible with the normal behavior of |xshift| in \tikzpkg. For some reason, saying |xshift = 1| in \tikzpkg\ does not shift the coordinate |(0,0)| to the coordinate |(1,0)| -- instead it shifts by 1pt. In \sseqpages\ , saying |xshift = 1| moves the coordinate |(0,0)| to the coordinate |(1,0)|. This includes \tikzpkg\ primitives: saying \codeverb|\draw[ xshift = 1 ] (0,0) -- (1,0);| inside a \sseqdataenv\ or \sseqpageenv\ environment is the same as saying \codeverb|\draw(1,0) -- (2,0);| despite the fact that this is not the case in the \tikzpictureenv\ environment. +A word of warning: the behavior of |xshift| in \sseqpages\ is incompatible with +the normal behavior of |xshift| in \tikzpkg. For some reason, saying% +|xshift = 1| in \tikzpkg\ does not shift the coordinate |(0,0)| to the +coordinate |(1,0)| -- instead it shifts by 1pt. In \sseqpages\ , saying% +|xshift = 1| moves the coordinate |(0,0)| to the coordinate |(1,0)|. This +includes \tikzpkg\ primitives: saying% +\codeverb|\draw[ xshift = 1 ] (0,0) -- (1,0);| inside a \sseqdataenv\ or +\sseqpageenv\ environment is the same as saying \codeverb|\draw(1,0) -- (2,0);| +despite the fact that this is not the case in the \tikzpictureenv\ environment. \end{keylist} \begin{manualentry}{Colors} -These come from the \LaTeX\ \colorpkg\ package via \tikzpkg, so see the \href{\colormanualurl}{\colorpkg\ package documentation} for more information. +These come from the \LaTeX\ \colorpkg\ package via \tikzpkg, so see the +\href{\colormanualurl}{\colorpkg\ package documentation} for more information. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ classes = {fill,inner sep = 0.4em}, no axes, scale = 1.3 ] @@ -366,9 +583,24 @@ These come from the \LaTeX\ \colorpkg\ package via \tikzpkg, so see the \href{ \end{manualentry} \begin{manualentry}{\pgfmanualpdflabel{""quotes}{}|"|\meta{text}|"|\opt{\meta{options}}} -Specify a label for a class, a differential, or a structure line. This uses the \tikzpkg\ quotes syntax. If the label text includes an equal sign or comma, you need to enclose the entire label in braces, e.g., \codeverb|\class["{x = y}"](0,0)|. The options include anything you might pass as an option to a \tikzpkg\ node, including arbitrary coordinate transforms, colors, opacity options, shapes, fill, draw, etc. The behavior is a little different depending on whether you use it on a class or on a differential or structure line. - -For a class, the \meta{text} is placed in the position |inside| the node by default -- in effect, the \meta{text} becomes the label text of the node (so saying |\class["label text"](0,0)| causes a similar effect to saying |\node at (0,0) {label text};|). There are other position options such as |left|, |above left|, etc which cause the label text to be placed in a separate node positioned appropriately. If the placement is above, left, etc, then any option that you may pass to a \tikzpkg\ node will also work for the label, including general coordinate transformations. If the placement is ``inside'', then the only relevant \opt{\meta{options}} are those that alter the appearance of text, such as opacity and color. +Specify a label for a class, a differential, or a structure line. This uses the +\tikzpkg\ quotes syntax. If the label text includes an equal sign or comma, you +need to enclose the entire label in braces, e.g., \codeverb|\class["{x = +y}"](0,0)|. The options include anything you might pass as an option to a +\tikzpkg\ node, including arbitrary coordinate transforms, colors, opacity +options, shapes, fill, draw, etc. The behavior is a little different depending +on whether you use it on a class or on a differential or structure line. + +For a class, the \meta{text} is placed in the position |inside| the node by +default -- in effect, the \meta{text} becomes the label text of the node (so +saying |\class["label text"](0,0)| causes a similar effect to saying% +|\node at (0,0) {label text};|). There are other position options such as% +|left|, |above left|, etc which cause the label text to be placed in a separate +node positioned appropriately. If the placement is above, left, etc, then any +option that you may pass to a \tikzpkg\ node will also work for the label, +including general coordinate transformations. If the placement is ``inside'', +then the only relevant \opt{\meta{options}} are those that alter the appearance +of text, such as opacity and color. \begin{codeexample}[width = 4cm] \begin{sseqpage}[ classes = { minimum width = width("a") + 0.5em }, no axes ] \class["a"](0,0) @@ -379,8 +611,13 @@ For a class, the \meta{text} is placed in the position |inside| the node by defa \class["a" { above right = {1em} }](2,1) \end{sseqpage} \end{codeexample} -You can adjust the default behavior of class labels using the |labels| style option or its relatives |class labels|, |inner class labels| or |outer class labels|. -Note that it is also possible to give a label to a |\node| this way, although the behavior is slightly different. In particular, the label defaults to the |above| position instead of going in the |\node| text by default. Also, this won't respect the various label style options like |labels|, etc. +You can adjust the default behavior of class labels using the |labels| style +option or its relatives |class labels|, |inner class labels| or% +|outer class labels|. Note that it is also possible to give a label to a |\node| +this way, although the behavior is slightly different. In particular, the label +defaults to the |above| position instead of going in the |\node| text by +default. Also, this won't respect the various label style options like |labels|, +etc. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ no axes ] \class(0,0) @@ -389,8 +626,10 @@ Note that it is also possible to give a label to a |\node| this way, although th \end{sseqpage} \end{codeexample} -\begin{key}{pin = \meta{style}} -The |pin| key makes \sseqpages\ draw a line connecting the label to the relevant class, which can provide necessary clarification in dense diagrams. The pin key itself can take options which adjust the way that the line is drawn: +\begin{key}{pin = \meta{style}} % +The |pin| key makes \sseqpages\ draw a line connecting the label to the relevant +class, which can provide necessary clarification in dense diagrams. The pin key +itself can take options which adjust the way that the line is drawn: \begin{codeexample}[width = 6cm] \begin{sseqpage} \class(0,0) @@ -403,7 +642,10 @@ The |pin| key makes \sseqpages\ draw a line connecting the label to the relevant \end{key} -For either a |\structline| or a |\class| the label normally goes on the right side of the edge. The special option |'| makes it go in the opposite position from the default. I imitated the label handling in the \tikzcdpkg\ package, so if you use \tikzcdpkg, this should be familiar. +For either a |\structline| or a |\class| the label normally goes on the right +side of the edge. The special option |'| makes it go in the opposite position +from the default. I imitated the label handling in the \tikzcdpkg\ package, so +if you use \tikzcdpkg, this should be familiar. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ Adams grading, yscale = 0.63 ] \class(0,0) @@ -416,7 +658,10 @@ For either a |\structline| or a |\class| the label normally goes on the right si \d[ "\cdot 2" { pos = 0.7, yshift = -5pt } ] 2 (1,0) \end{sseqpage} \end{codeexample} -You can use the style options |labels|, |edge labels|, |differential labels|, and |struct line labels| to adjust the styling of edge labels. For instance, if you would prefer for the labels to default to the left hand side of the edge rather than the right hand side, you could say |edge labels = {auto = left}|. +You can use the style options |labels|, |edge labels|, |differential labels|, +and |struct line labels| to adjust the styling of edge labels. For instance, if +you would prefer for the labels to default to the left hand side of the edge +rather than the right hand side, you could say |edge labels = {auto = left}|. You can also use quotes to label edges drawn with \tikzpkg\ primitives: \begin{codeexample}[width = 6cm] \begin{sseqpage}[ yscale = 0.58, no axes ] @@ -428,7 +673,11 @@ You can also use quotes to label edges drawn with \tikzpkg\ primitives: \needspace{3\baselineskip} \begin{key}{description} -The |description| key, stolen from \tikzcdpkg, places the label on top of the edge. In order to make this option work correctly, if the background coolor is not the default white, you must inform \sseqpages\ about this using the key |background color = |\meta{color}. In this document, the background color is called \textit{graphicbackground}. +The |description| key, stolen from \tikzcdpkg, places the label on top of the +edge. In order to make this option work correctly, if the background coolor is +not the default white, you must inform \sseqpages\ about this using the key +|background color = |\meta{color}. In this document, the background color is +called \textit{graphicbackground}. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ no axes, background color = graphicbackground ] \foreach \x in {0,1,2} \foreach \y in {0,1} { @@ -445,11 +694,18 @@ The |description| key, stolen from \tikzcdpkg, places the label on top of the ed \subsection{Options for \sectionstring\class}\pgfmanualpdflabel{class options}{} -Because the main job of the |\class| command is to print a \tikzpkg\ |\node| on the appropriate pages of the spectral sequence, most options that would work for a \tikzpkg\ node also work for the commands |\class|, |\replaceclass|, and |\classoptions|. Here are a few that you might care about: +Because the main job of the |\class| command is to print a \tikzpkg\ |\node| on +the appropriate pages of the spectral sequence, most options that would work for +a \tikzpkg\ node also work for the commands |\class|, |\replaceclass|, and +|\classoptions|. Here are a few that you might care about: \begin{manualentry}{A \tikzpkg\ shape} -If you give the name of a \tikzpkg\ shape, the class node will be of that shape. The standard \tikzpkg\ shapes are |circle| and |rectangle|. \sseqpages\ defines two new shapes: -\begin{key}{circlen = \meta{n}} -This draws $n$ concentric circles. It's intended for indicating a $\mathbb{Z}/p^n$ summand. For large values of $n$ the result isn't all that appealing. +If you give the name of a \tikzpkg\ shape, the class node will be of that shape. +The standard \tikzpkg\ shapes are |circle| and |rectangle|. \sseqpages\ defines +two new shapes: +\begin{key}{circlen = \meta{n}}% +This draws $n$ concentric circles. It's intended for indicating a +$\mathbb{Z}/p^n$ summand. For large values of $n$ the result isn't all that +appealing. \begin{codeexample}[] \begin{sseqpage}[ no axes ] \class[circlen = 2](0,0) @@ -460,11 +716,13 @@ This draws $n$ concentric circles. It's intended for indicating a $\mathbb{Z}/p^ \end{codeexample} \end{key} -\begin{keylist}{newellipse,ellipse ratio = \meta{ratio}} -This shape is used for |\circleclasses|. It's a variant on the |ellipse| shape that gives more control over the ellipse's aspect ratio. +\begin{keylist}{newellipse,ellipse ratio = \meta{ratio}}% +This shape is used for |\circleclasses|. It's a variant on the |ellipse| shape +that gives more control over the ellipse's aspect ratio. \end{keylist} -There are many more \tikzpkg\ shapes in the shapes library, which you can load using the command |\usetikzlibrary{shapes}|. The following are some examples: +There are many more \tikzpkg\ shapes in the shapes library, which you can load +using the command |\usetikzlibrary{shapes}|. The following are some examples: \begin{codeexample}[width = 6cm] \begin{sseqpage}[ no axes, classes = { inner sep = 0.4em }, class placement transform = { scale = 1.8 }, @@ -483,8 +741,12 @@ There are many more \tikzpkg\ shapes in the shapes library, which you can load u See the \href{\pgfmanualurl#section.49}{\tikzpkg\ manual} for more information. \end{manualentry} -\begin{keylist}{minimum width = \meta{dimension}, minimum height = \meta{dimension}, minimum size = \meta{dimension}, inner sep = \meta{dimension}, outer sep = \meta{dimension}} -These options control the size of a node. This is typically useful to make the size of nodes consistent independent of the size of their label text. For instance: +\begin{keylist}{minimum width = \meta{dimension}, minimum height = +\meta{dimension}, minimum size = \meta{dimension}, inner sep = \meta{dimension}, +outer sep = \meta{dimension}}% +These options control the size of a node. This is typically useful to make the +size of nodes consistent independent of the size of their label text. For +instance: \begin{codeexample}[width = 5cm] \begin{sseqdata}[ name = minimum width example, no axes, yscale = 0.8 ] \class["ab"](0,0) @@ -497,10 +759,18 @@ These options control the size of a node. This is typically useful to make the s \end{codeexample} \end{keylist} -\begin{key}{class:name = \meta{node name}} -The |\class| command makes a \tikzpkg\ node on appropriate pages. You can refer to this node using \tikzpkg\ commands by using its coordinates. Using the |class:name| option, you can give the node a name, which you can use to refer to the class. Using names creates more readable code. The |show name| option can be used to display the names of classes. You can modify the names of classes systematically using the options |class name prefix|, |class name postfix|, and |class name handler|. - -Named classes are immune to coordinate transformations. For example, in the following code, |xshift| does not apply to the nodes specified by |(id)| and |(eta)| but does apply to the coordinate specified by |(1,1)|: +\begin{key}{class:name = \meta{node name}}% +The |\class| command makes a \tikzpkg\ node on appropriate pages. You can refer +to this node using \tikzpkg\ commands by using its coordinates. Using the +|class:name| option, you can give the node a name, which you can use to refer to +the class. Using names creates more readable code. The |show name| option can be +used to display the names of classes. You can modify the names of classes +systematically using the options |class name prefix|, |class name postfix|, and +|class name handler|. + +Named classes are immune to coordinate transformations. For example, in the +following code, |xshift| does not apply to the nodes specified by |(id)| and +|(eta)| but does apply to the coordinate specified by |(1,1)|: \begin{codeexample}[width = 6cm] \begin{sseqpage}[classes = { show name=above }] \class[class:name = 1](0,0) @@ -514,7 +784,12 @@ Named classes are immune to coordinate transformations. For example, in the foll \begin{key}{show name = \meta{label options}} \declareasstyle{show name} -This option is like saying |"class name"\marg{label options}| if the class has a name, and does nothing if the class has no name. If the class has multiple names, only the most recent is used. This is particularly useful with class styles, . For instance, by saying |this page classes = { show name = above }| you can display names of all of the sources and targets of differentials on each page. +This option is like saying |"class name"\marg{label options}| if the class has a +name, and does nothing if the class has no name. If the class has multiple +names, only the most recent is used. This is particularly useful with class +styles, . For instance, by saying |this page classes = { show name = above }| +you can display names of all of the sources and targets of differentials on each +page. \begin{codeexample}[width=7cm] \begin{sseqdata}[ name = show name example, @@ -534,8 +809,11 @@ This option is like saying |"class name"\marg{label options}| if the class has a \end{codeexample} \end{key} -\begin{key}{tag = \meta{tag}} -This key adds a tag to the current class. Tags are used for identifying which of multiple classes in the same position you are referring to. They are useful when you have groups of related classes and want a family of differentials connecting them. For instance: +\begin{key}{tag = \meta{tag}}% +This key adds a tag to the current class. Tags are used for identifying which of +multiple classes in the same position you are referring to. They are useful when +you have groups of related classes and want a family of differentials connecting +them. For instance: \begin{codeexample}[width = 8cm] \DeclareSseqGroup\tower {} { \class(0,0) @@ -561,16 +839,27 @@ This key adds a tag to the current class. Tags are used for identifying which of } \end{sseqpage} \end{codeexample} -We want each differential to go from the |h21| vee to the |id| vee, independent of which classes are in the same position of the two vees. The easy way to accomplish this is by giving tags to each of the two vees. +We want each differential to go from the |h21| vee to the |id| vee, independent +of which classes are in the same position of the two vees. The easy way to +accomplish this is by giving tags to each of the two vees. \end{key} -\begin{key}{insert = \meta{integer}} -If there are multiple classes in the same position, this option allows you to insert classes later into earlier positions. This is intended to help you put logically related classes next to each other. If the integer is positive, it inserts the class in the specified position, and if the integer is negative, it counts backwards from the end. Providing |0| is the same as omitting the option entirely. Values larger in absolute value than the total number of classes are truncated. Consider: +\begin{key}{insert = \meta{integer}}% +If there are multiple classes in the same position, this option allows you to +insert classes later into earlier positions. This is intended to help you put +logically related classes next to each other. If the integer is positive, it +inserts the class in the specified position, and if the integer is negative, it +counts backwards from the end. Providing |0| is the same as omitting the option +entirely. Values larger in absolute value than the total number of classes are +truncated. Consider: \codeexample[from file=insert] \end{key} -\begin{key}{offset = \{\pars{\meta{x offset},\meta{y offset}}\}} -By default, a class uses the offset specified by |class pattern|. Occasionally this is undesirable. In this case, you can specify the offset for a particular class by hand. For example if the sum of two classes is hit by a differential, it looks better for the class replacing them to be centered: +\begin{key}{offset = \{\pars{\meta{x offset},\meta{y offset}}\}}% +By default, a class uses the offset specified by |class pattern|. Occasionally +this is undesirable. In this case, you can specify the offset for a particular +class by hand. For example if the sum of two classes is hit by a differential, +it looks better for the class replacing them to be centered: \begin{codeexample}[width = 9cm] \begin{sseqdata}[ name = offset example, xscale = 0.7, @@ -592,12 +881,29 @@ By default, a class uses the offset specified by |class pattern|. Occasionally t \end{codeexample} \end{key} -\begin{key}{tooltip = \meta{text}} -This key generates a ``tooltip'' over the given class. That is, if you hover your mouse over it, a little window will popup with the tooltip text. This is particularly useful to give the coordinates or names of classes in large charts where it may be hard to tell from looking at the picture what position the class is in, or there may not be room to supply names to classes. - -The tooltip is made using the |\pdftooltip| command from the |pdfcomment| package. The |pdfcomment| package generates two extra auxiliary files, so it is not included by default. In order to use the |tooltip| option, you have to use the |tooltips| package option (e.g., load \sseqpages\ with |\usepackage[tooltips]{spectralsequences}|). This cannot handle math, but it will print math expressions into \TeX\ input form. Not all pdf viewers will display the tooltip correctly. If this concerns you, the command |\sseqtooltip| is used to produce the tooltip, and you can redefine it as any other command that takes |\sseqtooltip|\marg{text}\marg{tooltip text} and produces a tooltip. For instance, on \href{https://tex.stackexchange.com/a/164186/23866}{this stack exchange post}, there is code that supposedly produces tooltips that work with Evince. I have not tested whether it works by itself or whether it works with my package, but you could. You could potentially figure out how to get math to work in tooltips too -- if you find a satisfactory method, please let me know. - -Anyways, here's an example: +\begin{key}{tooltip = \meta{text}}% +This key generates a ``tooltip'' over the given class. That is, if you hover +your mouse over it, a little window will popup with the tooltip text. This is +particularly useful to give the coordinates or names of classes in large charts +where it may be hard to tell from looking at the picture what position the class +is in, or there may not be room to supply names to classes. + +The tooltip is made using the |\pdftooltip| command from the |pdfcomment| +package. The |pdfcomment| package generates two extra auxiliary files, so it is +not included by default. In order to use the |tooltip| option, you have to use +the |tooltips| package option (e.g., load \sseqpages\ with +|\usepackage[tooltips]{spectralsequences}|). This cannot handle math, but it +will print math expressions into \TeX\ input form. Not all pdf viewers will +display the tooltip correctly. If this concerns you, the command |\sseqtooltip| +is used to produce the tooltip, and you can redefine it as any other command +that takes |\sseqtooltip|\marg{text}\marg{tooltip text} and produces a tooltip. +For instance, on \href{https://tex.stackexchange.com/a/164186/23866}{this stack +exchange post}, there is code that supposedly produces tooltips that work with +Evince. I have not tested whether it works by itself or whether it works with my +package, but you could. You could potentially figure out how to get math to work +in tooltips too -- if you find a satisfactory method, please let me know. + +Here's an example: \begin{codeexample}[] \begin{sseqpage}[classes = {tooltip = {(\xcoord,\ycoord)}}] \class(0,0) @@ -607,13 +913,19 @@ Anyways, here's an example: \end{sseqpage} \end{codeexample} -There's another example at the beginning of the section on the \hyperref[sec:class stack]{class stack}. +There's another example at the beginning of the section on the +\hyperref[sec:class stack]{class stack}. \end{key} -\begin{keylist}{class:page = \meta{page}\opt{-{}-\meta{page max}},generation = \meta{generation}\opt{-{}-\meta{generation max}}} +\begin{keylist}{ + class:page = \meta{page}\opt{-{}-\meta{page max}}, + generation = \meta{generation}\opt{-{}-\meta{generation max}} +} \def\classpagehandler#1#2{\textcolor{keycolor}{\noligs{#2}}} \declarecustomhandler{class:page}{\classpagehandler} -These options only work in |\classoptions|. The |page| option gives a range of pages for which the options apply to. If only one page is specified, it is the minimum page and the option applies to all larger pages. +These options only work in |\classoptions|. The |page| option gives a range of +pages for which the options apply to. If only one page is specified, it is the +minimum page and the option applies to all larger pages. \begin{codeexample}[width = 6cm] \begin{sseqdata}[ name = page_example, no axes, title = \page, title style = {yshift = -0.5cm} ] @@ -625,22 +937,36 @@ These options only work in |\classoptions|. The |page| option gives a range of p \printpage[ name = page_example, page = 2 ] \qquad \printpage[ name = page_example, page = 4 ] \end{codeexample} -A ``generation'' of a class is the interval from one call of |\class| or |\replaceclass| to the page on which it next supports or is hit by a differential. -By default the |\classoptions| command adds options only to the most recent generation of the class in a \sseqdataenv\ environment, or on the generation appropriate to the current page in a \sseqpageenv\ environment. Using the |generation| option allows you to provide a single generation or range of generations of the class that the options should apply to. The first generation is generation 0, and the most recent generation is generation -1. Larger negative values count backwards. +A ``generation'' of a class is the interval from one call of |\class| or +|\replaceclass| to the page on which it next supports or is hit by a +differential. By default the |\classoptions| command adds options only to the +most recent generation of the class in a \sseqdataenv\ environment, or on the +generation appropriate to the current page in a \sseqpageenv\ environment. +Using the |generation| option allows you to provide a single generation or range +of generations of the class that the options should apply to. The first +generation is generation 0, and the most recent generation is generation -1. +Larger negative values count backwards. \codeexample[from file=class-page2a] \codeexample[from file=class-page2b] \end{keylist} \begin{commandlist}{\xcoord,\ycoord} -These commands represent the $\mathtt{x}$ and $\mathtt{y}$ coordinate of the current class when used in class options. The only use I have for them is in the |tooltip| option, but maybe there is some other purpose for them. +These commands represent the $\mathtt{x}$ and $\mathtt{y}$ coordinate of the +current class when used in class options. The only use I have for them is in the +|tooltip| option, but maybe there is some other purpose for them. \end{commandlist} -\subsection{Options for \sectionstring\d\ and \sectionstring\structline} -Because the main job of the |\d| and |\structline| commands is to print an edge on the appropriate pages of the spectral sequence, most \tikzpkg\ options that you could apply to a \tikzpkg\ ``to'' operator (as in |\draw (x1,y1) to (x2,y2);|) can be applied to both |\d| and |\structline|. Some such options are as follows: +\subsection{Options for \sectionstring\d, \sectionstring\structline, and \sectionstring\extension} +Because the main job of the |\d|, |\structline|, and |\extension| commands is to +print an edge on the appropriate pages of the spectral sequence, most \tikzpkg\ +options that you could apply to a \tikzpkg\ ``to'' operator (as in% +|\draw (x1,y1) to (x2,y2);|) can be applied to |\d|, |\structline|, and +|\extension|. Some such options are as follows: \begin{keylist}{source anchor = \meta{anchor}, target anchor = \meta{anchor}} -Because you can't use the normal \tikzpkg\ mechanism for specifying the source and target anchors, \sseqpages\ has these two keys for |\d| and |\structline|: +Because you can't use the normal \tikzpkg\ mechanism for specifying the source +and target anchors, \sseqpages\ has these two keys for |\d| and |\structline|: \begin{codeexample}[width = 4cm] \begin{sseqpage}[ no axes, yscale = 1.24 ] \foreach \x in {0,1} \foreach \y in {0,1} { @@ -653,12 +979,15 @@ Because you can't use the normal \tikzpkg\ mechanism for specifying the source a \end{keylist} -\begin{keylist}{shorten > = \meta{distance}, shorten < = \meta{distance}} -These behave exactly like the corresponding options from \tikzpkg\ , shortening the end and beginning of the edge respectively. Note that you can lengthen the edge by shortening by a negative amount. +\begin{keylist}{shorten > = \meta{distance}, shorten < = \meta{distance}}% +These behave exactly like the corresponding options from \tikzpkg\ , shortening +the end and beginning of the edge respectively. Note that you can lengthen the +edge by shortening by a negative amount. \end{keylist} \begin{manualentry}{Dash patterns:} -See the \href{\pgfmanualurl#subsubsection.15.3.2}{\tikzpkg\ manual} for a complete explanation of the dash pattern related options. Some examples: +See the \href{\pgfmanualurl#subsubsection.15.3.2}{\tikzpkg\ manual} for a +complete explanation of the dash pattern related options. Some examples: \begin{codeexample}[width = 6cm] \begin{sseqpage}[ no axes, yscale = 1.6 ] \foreach \x in {0,1,2} \foreach \y in {0,1} { @@ -672,7 +1001,10 @@ See the \href{\pgfmanualurl#subsubsection.15.3.2}{\tikzpkg\ manual} for a compl % \end{manualentry} -\begin{keylist}{bend left = \meta{angle}, bend right = \meta{angle}, *in = \meta{anchor}, *out = \meta{anchor}} +\begin{keylist}{% + bend left = \meta{angle}, bend right = \meta{angle},% + *in = \meta{anchor}, *out = \meta{anchor}% +}% \begin{codeexample}[width = 6cm] \begin{sseqpage}[no axes,yscale = 1.6] \foreach \x in {0,1,2} \foreach \y in {0,1} { @@ -686,11 +1018,18 @@ See the \href{\pgfmanualurl#subsubsection.15.3.2}{\tikzpkg\ manual} for a compl \end{keylist} %\begin{key}{invisible} -%This key is only for |\d|. It prevents a differential from being drawn at all. The typical reason you might want this is so that you can draw your own differential using \tikzpkg\ commands. See |\getdtarget| for an example of this. -%\end{key} +% +% This key is only for |\d|. It prevents a differential from being drawn at all. +% The typical reason you might want this is so that you can draw your own +% differential using \tikzpkg\ commands. See |\getdtarget| for an example of +% this. +% +% \end{key} -\begin{key}{structline:page = \meta{page}\opt{-{}-\meta{page max}}} -This key is only for |\structline| and |\structlineoptions|. By default, the |\structline| command only adds a structure line starting on the page where the most recent generation of the source or target is born: +\begin{key}{structline:page = \meta{page}\opt{-{}-\meta{page max}}}% +This key is only for |\structline| and |\structlineoptions|. By default, the +|\structline| command only adds a structure line starting on the page where the +most recent generation of the source or target is born: \begin{codeexample}[width = 7.6cm] \begin{sseqdata}[ name = structpage example, @@ -708,7 +1047,8 @@ This key is only for |\structline| and |\structlineoptions|. By default, the |\s \printpage[name = structpage example,page = 4] \end{codeexample} -By specifying a page number, you can adjust which page the |\structline| starts on: +By specifying a page number, you can adjust which page the |\structline| starts +on: \begin{codeexample}[] \begin{sseqdata}[ name = structpage example2, title = \page, yscale = 0.5 ] @@ -729,12 +1069,15 @@ By specifying a page number, you can adjust which page the |\structline| starts \printpage[ name = structpage example2, page = 4 ] \end{codeexample} -Similarly, for |\structlineoptions| you can specify a minimum page on which to apply the options, or a range of pages. +Similarly, for |\structlineoptions| you can specify a minimum page on which to +apply the options, or a range of pages. \end{key} \subsection{Options for \sectionstring\circleclass} -\begin{key}{fit = \meta{coordinates or nodes}} -The |\circleclasses| command uses the \href{\pgfmanualurl#section.52}{\tikzpkg\ fitting library}. Sometimes it's desirable to make the resulting node fit extra things, for example a label. It doesn't necessarily end up looking great though. +\begin{key}{fit = \meta{coordinates or nodes}}% +The |\circleclasses| command uses the \href{\pgfmanualurl#section.52}{\tikzpkg\ +fitting library}. Sometimes it's desirable to make the resulting node fit extra +things, for example a label. It doesn't necessarily end up looking great though. \begin{codeexample}[] \begin{sseqpage}[ Adams grading, axes gap = 0.7cm ] \class(0,2) @@ -747,35 +1090,57 @@ The |\circleclasses| command uses the \href{\pgfmanualurl#section.52}{\tikzpkg\ \end{key} \begin{key}{rounded rectangle} -You can put a shape as an option and it will change the shape of the node drawn by |\circleclasses|. Any shape will do, but I think that an |ellipse| or |rounded rectangle| are the only particularly appealing options. +You can put a shape as an option and it will change the shape of the node drawn +by |\circleclasses|. Any shape will do, but I think that an |ellipse| or +|rounded rectangle| are the only particularly appealing options. \end{key} -\begin{key}{ellipse ratio = \meta{ratio} (initially 1.2)} -By default, the shape drawn by |\circleclasses| is a ``newelipse'' which is a custom defined shape that respects the option |elipse ratio| which roughly controls how long and skinny versus short and fat the ellipse is. If you find that the ellipse is too long, try a larger value of this option, and conversely if it's too fat try a smaller value. If no value is satisfactory, try out the |rounded rectangle| shape. (This is stolen from the following stack exchange answer: \url{https://tex.stackexchange.com/a/24621}.) +\begin{key}{ellipse ratio = \meta{ratio} (initially 1.2)}% +By default, the shape drawn by |\circleclasses| is a ``newelipse'' which is a +custom defined shape that respects the option |elipse ratio| which roughly +controls how long and skinny versus short and fat the ellipse is. If you find +that the ellipse is too long, try a larger value of this option, and conversely +if it's too fat try a smaller value. If no value is satisfactory, try out the +|rounded rectangle| shape. (This is stolen from the following stack exchange +answer: \url{https://tex.stackexchange.com/a/24621}.) \end{key} -\begin{keylist}{cc:class style,cc:permanent cycle style,cc:transient cycle style,cc:this page class style,cc:differential style,cc:struct line style} -See the \pgfmanualpdfref{class style}{corresponding entry} in the \tikzpkg\ primitives section. +\begin{keylist}{ + cc:class style,cc:permanent cycle style,cc:transient cycle style, + cc:this page class style,cc:differential style,cc:struct line style +} +See the \pgfmanualpdfref{class style}{corresponding entry} in the \tikzpkg\ +primitives section. \end{keylist} -\begin{key}{cc:page = \meta{page}\opt{-{}-\meta{page max}}} -By default, the ellipse will be drawn on the same set of pages that a structure line between the two classes would be drawn on. This specifies a range of pages for the ellipse to be drawn. Note that unlike with structure lines, you can instruct |\circleclasses| to draw the shape even on pages where one or both of the classes that it is fitting are dead. +\begin{key}{cc:page = \meta{page}\opt{-{}-\meta{page max}}}% +By default, the ellipse will be drawn on the same set of pages that a structure +line between the two classes would be drawn on. This specifies a range of pages +for the ellipse to be drawn. Note that unlike with structure lines, you can +instruct |\circleclasses| to draw the shape even on pages where one or both of +the classes that it is fitting are dead. \end{key} \subsection{Options for \tikzpkg\ primitives} -\begin{key}{background} -This key instructs \sseqpages\ to put the current \tikzpkg\ primitive in the background. The way that the spectral sequence is printed is as follows: +\begin{key}{background}% +This key instructs \sseqpages\ to put the current \tikzpkg\ primitive in the +background. The way that the spectral sequence is printed is as follows: \begin{itemize} -\item The title, axes, axes ticks, and axes labels are printed (the appropriate steps are skipped when the |no title|, |no axes|, |no ticks|, or |no labels| keys are used or if no title or axes labels are provided). +\item The title, axes, axes ticks, and axes labels are printed (the appropriate +steps are skipped when the |no title|, |no axes|, |no ticks|, or |no labels| +keys are used or if no title or axes labels are provided). \item The \tikzpkg\ background paths are printed. \item The clipping is inserted (unless the |no clip| key is used). -\item All foreground elements (classes, differentials, structure lines, and normal \tikzpkg\ paths) are printed. +\item All foreground elements (classes, differentials, structure lines, and +normal \tikzpkg\ paths) are printed. \end{itemize} -In particular, this means that foreground \tikzpkg\ paths can be clipped by the standard clipping, but background paths that are outside of the clipping expand the size of the \tikzpkg\ picture. +In particular, this means that foreground \tikzpkg\ paths can be clipped by the +standard clipping, but background paths that are outside of the clipping expand +the size of the \tikzpkg\ picture. \begin{codeexample}[] \begin{sseqpage}[ no ticks, yscale = 0.9, math nodes = false ] \class(0,0) @@ -787,7 +1152,9 @@ In particular, this means that foreground \tikzpkg\ paths can be clipped by the \node at (0.5,-0.4) {clipped}; \end{sseqpage} \end{codeexample} -Here is an example where \tikzpkg\ labels with the |background| key are used to add labels and a grid. Note that this styling is easier to make using the |title|, |x label|, |y label|, and |grid| options. +Here is an example where \tikzpkg\ labels with the |background| key are used to +add labels and a grid. Note that this styling is easier to make using the +|title|, |x label|, |y label|, and |grid| options. \begin{codeexample}[] \begin{sseqdata}[ name = tikz background example, cohomological Serre grading, classes = fill ] \begin{scope}[background] @@ -806,7 +1173,8 @@ Here is an example where \tikzpkg\ labels with the |background| key are used to \printpage[name = tikz background example, page = 3] \end{codeexample} -For this particular use case, it's probably better to use |title|, |x label|, and |y label|: +For this particular use case, it's probably better to use |title|, |x label|, +and |y label|: \begin{codeexample}[] \begin{sseqdata}[ name = tikz background example2, cohomological Serre grading, classes = fill, grid = go, title = { Page \page }, x label = { $H^*(B)$ }, y label = { $H^*(F)$ } ] @@ -820,9 +1188,15 @@ For this particular use case, it's probably better to use |title|, |x label|, an \printpage[name = tikz background example2, page = 3] \end{codeexample} -But if you need more flexible labeling, you'll likely want to use tikz primitives with |background|. See \example{KF3} for an instance where this key is useful. +But if you need more flexible labeling, you'll likely want to use tikz +primitives with |background|. See \example{KF3} for an instance where this key +is useful. -One useful tip is that you can ensure consistent bounding boxes between different diagrams using |\path[background] (smallest x, smallest y) -- (largest x, largest y);|: +One useful tip is that you can ensure consistent bounding boxes between +different diagrams using% +\begin{center} +|\path[background] (smallest x, smallest y) -- (largest x, largest y);|: +\end{center} \begin{codeexample}[] \begin{sseqdata}[ name = boundingboxex, x range = {0}{2}, y range = {0}{2}, scale = 0.5 ] \end{sseqdata} @@ -840,24 +1214,40 @@ One useful tip is that you can ensure consistent bounding boxes between differen \begin{keylist}{page constraint = \meta{predicate}, page constraint or = \meta{predicate}} \declarecustomhandler{page constraint}{\codehandler} -This places a constraint on the pages in which the \tikzpkg\ primitive is printed. This predicate should look something like -\texttt{(\string\page\ <= 4)} |&&| \texttt{(\string\page\ >= 3)}. The predicate is anded together with any previous predicates, so that you can use this as an option for a \scopeenv\ and again for the individual \tikzpkg\ primitive. +This places a constraint on the pages in which the \tikzpkg\ primitive is +printed. This predicate should look something like \texttt{(\string\page\ <= 4)} +|&&| \texttt{(\string\page\ >= 3)}. The predicate is anded together with any +previous predicates, so that you can use this as an option for a \scopeenv\ and +again for the individual \tikzpkg\ primitive. \begin{commandlist}{\isalive\pararg{coordinate},\isalive\{\pararg{coordinate 1}$\cdots$\pararg{coordinate n}\}} This command can only be used with |page constraint|. Saying -\[|page constraint = {\pars{\meta{x},\meta{y}\opt{,}\oarg{index}}}}}|\] +\begin{center} + |page constraint = {\pars{\meta{x},\meta{y}\opt{,}\oarg{index}}}}}| +\end{center} will print the \tikzpkg\ primitive only on pages where the specified class is alive. Saying -\[|page constraint = {\isalive(\meta{coordinate 1})|\,\cdots\,|(\meta{coordinate n})}|\] +\begin{center} + |page constraint = {\isalive(\meta{coordinate 1})|$\,\cdots\,$|(\meta{coordinate n})}| +\end{center} is equivalent to -\[|page constraint = {\isalive\pararg{coordinate 1} &&|\,\cdots\,|&& \isalive\pararg{coordinate n}}|\] +\begin{center} + |page constraint = {\isalive\pararg{coordinate 1} &&|$\,\cdots\,$|&& \isalive\pararg{coordinate n}}| +\end{center} Writing -\[\codeverb|\draw[page constraint = {\isalive(1,0)(2,2)}](1,0)|\texttt{-{}-}|(2,2);|\] -is the same as |\structline(1,0)(2,2)|, except that you can't later use |\structlineoptions| on it (and it won't have the |struct lines| style applied). +\begin{center} + \codeverb|\draw[page constraint = {\isalive(1,0)(2,2)}](1,0)|\texttt{-{}-}|(2,2);| +\end{center} +is the same as |\structline(1,0)(2,2)|, except that you can't later use +|\structlineoptions| on it (and it won't have the |struct lines| style applied). \end{commandlist} \end{keylist} -\begin{keylist}{class style,permanent cycle style,transient cycle style,this page class style,differential style,struct line style} -These classes apply the styling of the corresponding element to your \tikzpkg\ commands. +\begin{keylist}{c + lass style,permanent cycle style,transient cycle style, + this page class style,differential style,struct line style +} +These classes apply the styling of the corresponding element to your \tikzpkg\ +commands. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ differentials = blue, yscale = 0.65, no axes ] \class(0,2) @@ -873,8 +1263,17 @@ See |\getdtarget| for a more natural example. \section{Miscellaneous Commands} \subsection{Settings} -\begin{command}{\sseqset\marg{keys}} -The |\sseqset| command is for adjusting the global options for all spectral sequences in the current scope, or for applying options to the rest of the current spectral sequence. For instance, if most of the spectral sequences in the current document are going to be Adams graded, you can say |\sseqset{Adams grading}| and all future spectral sequences in the current scope will have Adams grading (unless you specify a different grading explicitly). As another example, |\sseqset{no axes}| will suppress axes from spectral sequences in the current scope. Note that defaults only apply to new \sseqdataenv\ environments or to unnamed \sseqpageenv\ environments; they won't apply to existing spectral sequences. +\begin{command}{\sseqset\marg{keys}}% +The |\sseqset| command is for adjusting the global options for all spectral +sequences in the current scope, or for applying options to the rest of the +current spectral sequence. For instance, if most of the spectral sequences in +the current document are going to be Adams graded, you can say% +|\sseqset{Adams grading}| and all future spectral sequences in the current scope +will have Adams grading (unless you specify a different grading explicitly). As +another example, |\sseqset{no axes}| will suppress axes from spectral sequences +in the current scope. Note that defaults only apply to new \sseqdataenv\ +environments or to unnamed \sseqpageenv\ environments; they won't apply to +existing spectral sequences. You can also use |\sseqset| to create styles to be used in spectral sequences. \begin{keylist}{ @@ -882,8 +1281,12 @@ You can also use |\sseqset| to create styles to be used in spectral sequences. .global sseq append style = \meta{keys}, .sseq style = \meta{keys}, .sseq append style = \meta{keys} -} -These handlers create reusable styles to be used in spectral sequences. If this style is a set of global options, then use the |.global sseq style| handler, whereas if it is supposed to be applied to individual features (classes, differentials, structure lines, circle classes, and tikz primitives) then use the |.sseq style| handler. +}% +These handlers create reusable styles to be used in spectral sequences. If this +style is a set of global options, then use the |.global sseq style| handler, +whereas if it is supposed to be applied to individual features (classes, +differentials, structure lines, circle classes, and tikz primitives) then use +the |.sseq style| handler. \begin{codeexample}[width=6cm] \sseqset{ mysseq/.global sseq style = { @@ -907,21 +1310,44 @@ These handlers create reusable styles to be used in spectral sequences. If this \end{keylist} \end{command} -\begin{command}{\SseqErrorToWarning\meta{error-name}} -Turns the error with the given name into a warning. An error message will start by saying \let\eatclnifpresent\empty|spectralsequences error: "error-name"|. This is the name you need to put into this command. +\begin{command}{\SseqErrorToWarning\meta{error-name}}% +Turns the error with the given name into a warning. An error message will start +by saying \let\eatclnifpresent\empty|spectralsequences error: "error-name"|. +This is the name you need to put into this command. \end{command} -\begin{environment}{{quiet}} -This environment quiets error messages that occur inside of it. \sseqpages\ is pretty good at error recovery, and so most of commands will fail gracefully and do nothing if their preconditions aren't met. If there are any parsing errors in the body of the |{quiet}| environment, prepare to see low level internal error messages. You might also run into bugs in \sseqpages\ -- the error recovery code hasn't been that carefully tested. If you do get low level error messages, remember to comment out the |{quiet}| environment before trying to debug. - -This is particularly useful for code reuse commands. Sometimes there is a source of long differentials that only applies to classes that haven't already supported shorter differentials. Sometimes there should be a structure line if a certain class exists, but it might not exist. In these cases, the |{quiet}| environment will help you out. See also |\DrawIfValidDifferential|, which is a variant of |\d| that behaves as if it were inside a |{quiet}| environment. +\begin{environment}{{quiet}}% +This environment quiets error messages that occur inside of it. \sseqpages\ is +pretty good at error recovery, and so most of commands will fail gracefully and +do nothing if their preconditions aren't met. If there are any parsing errors in +the body of the |{quiet}| environment, prepare to see low level internal error +messages. You might also run into bugs in \sseqpages\ -- the error recovery code +hasn't been that carefully tested. If you do get low level error messages, +remember to comment out the |{quiet}| environment before trying to debug. + +This is particularly useful for code reuse commands. Sometimes there is a source +of long differentials that only applies to classes that haven't already +supported shorter differentials. Sometimes there should be a structure line if a +certain class exists, but it might not exist. In these cases, the |{quiet}| +environment will help you out. See also |\DrawIfValidDifferential|, which is a +variant of |\d| that behaves as if it were inside a |{quiet}| environment. \end{environment} \subsection{Code reuse commands} -\begin{command}{\foreach } -This command is from \tikzpkg\ and works in pretty much the same way in \sseqpages, though with slightly better variants. The |\foreach| command is very flexible and has a lot of variants. The basic usage is |\foreach \x in {\meta{xmin},...,\meta{xmax}} \marg{loop body}| which will execute |\meta{loop body}| with |\x| set to each value between \meta{xmin} and \meta{xmax} inclusive. If you want a step greater than 1, try |\foreach \x in {\meta{xmin},\meta{xmin}+\meta{xstep},...,\meta{xmax}} \marg{loop body}|. +\begin{command}{\foreach }% +This command is from \tikzpkg\ and works in pretty much the same way in +\sseqpages, though with slightly better variants. The |\foreach| command is very +flexible and has a lot of variants. The basic usage is% +|\foreach \x in {\meta{xmin},...,\meta{xmax}} \marg{loop body}| which will +execute |\meta{loop body}| with |\x| set to each value between \meta{xmin} and +\meta{xmax} inclusive. If you want a step greater than 1, try% +% +\begin{center} +|\foreach \x in {\meta{xmin},\meta{xmin}+\meta{xstep},...,\meta{xmax}}\marg{loop body}|. +\end{center} -If you need to do multiple loops with a common body, you can just stack the |\foreach| commands: +If you need to do multiple loops with a common body, you can just stack the +|\foreach| commands: \begin{codeexample}[width=6cm] \begin{sseqpage}[ xscale = 0.5, x tick step = 2 ] \foreach \x in {0,2,...,6} @@ -939,9 +1365,12 @@ You can also loop through tuples, for instance: } \end{sseqpage} \end{codeexample} -See the last example for |normalize monomial| for a better example of this usage. +See the last example for |normalize monomial| for a better example of this +usage. -There are tons of other things you can do with |\foreach|, though I haven't yet found need for them in combination with \sseqpages. See the \href{\pgfmanualurl#section.64}{\tikzpkg\ manual} for more details. +There are tons of other things you can do with |\foreach|, though I haven't yet +found need for them in combination with \sseqpages. See the +\href{\pgfmanualurl#section.64}{\tikzpkg\ manual} for more details. \end{command} \begin{commandlist}{ @@ -949,8 +1378,16 @@ There are tons of other things you can do with |\foreach|, though I haven't yet \DoUntilOutOfBounds\meta{loop body}, \DoUntilOutOfBoundsThenNMore\marg{extra iterations}\meta{loop body}, \iteration -} -The one use case that |\foreach| doesn't cover all that well is if you want the loop to always repeat until the features you are drawing go off the page. This is what |\DoUntilOutOfBounds| and |\DoUntilOutOfBoundsThenNMore| are for. These help ensure that if you change the range of your chart, infinite families will automatically be drawn correctly without the need to adjust a bunch of loop bounds. The purpose of |\DoUntilOutOfBoundsThenNMore| is for towers that are receiving a differential. If your spectral sequence is Adams graded, and a tower is receiving a $d_r$ differential from another tower, you should use |\DoUntilOutOfBoundsThenNMore{r}|: +}% +The one use case that |\foreach| doesn't cover all that well is if you want the +loop to always repeat until the features you are drawing go off the page. This +is what |\DoUntilOutOfBounds| and |\DoUntilOutOfBoundsThenNMore| are for. These +help ensure that if you change the range of your chart, infinite families will +automatically be drawn correctly without the need to adjust a bunch of loop +bounds. The purpose of |\DoUntilOutOfBoundsThenNMore| is for towers that are +receiving a differential. If your spectral sequence is Adams graded, and a tower +is receiving a $d_r$ differential from another tower, you should use +|\DoUntilOutOfBoundsThenNMore{r}|: \begin{codeexample}[width=7cm] \begin{sseqpage}[ Adams grading, classes = fill, @@ -991,20 +1428,41 @@ You can also nest |\DoUntilOutOfBounds| reasonably: } \end{sseqpage} \end{codeexample} -One important difference between |\foreach| and the |\Do| family of commands is that |\Do| has no effect on the stack. This is in order to ensure that they nest properly. +One important difference between |\foreach| and the |\Do| family of commands is +that |\Do| has no effect on the stack. This is in order to ensure that they nest +properly. -Note that if you are using these commands and you are planning to draw several pictures of the chart with restricted range, you need to specify a range for the \sseqdataenv\ that contains all of the ranges of pages that you want to draw. If you then want to set a smaller default range, specify the smaller range the first time you use \sseqpageenv\ or |\printpage| to draw the spectral sequence, and include the |keep changes| key. +Note that if you are using these commands and you are planning to draw several +pictures of the chart with restricted range, you need to specify a range for the +\sseqdataenv\ that contains all of the ranges of pages that you want to draw. If +you then want to set a smaller default range, specify the smaller range the +first time you use \sseqpageenv\ or |\printpage| to draw the spectral sequence, +and include the |keep changes| key. -The |\Do| command is less general than |\foreach|; the purpose is to provide a syntax for stack-based looping that is similar to |\DoUntilOutOfBounds| but with a fixed range. So |\Do{n}\marg{loop body}| repeats \meta{loop body} |n| times. The assumption is that the loop body draws something relative to the position of the |\lastclass|. +The |\Do| command is less general than |\foreach|; the purpose is to provide a +syntax for stack-based looping that is similar to |\DoUntilOutOfBounds| but with +a fixed range. So |\Do{n}\marg{loop body}| repeats \meta{loop body} |n| times. +The assumption is that the loop body draws something relative to the position of +the |\lastclass|. -If you need to know how many iterations one of these three commands has gone through, this is stored in the variable |\iteration|. +If you need to know how many iterations one of these three commands has gone +through, this is stored in the variable |\iteration|. \end{commandlist} \begin{commandlist}{\NewSseqCommand \cmdarg{command}\marg{argspec}\marg{body}, \DeclareSseqCommand\cmdarg{command}\marg{argspec}\marg{body}} % TODO: Explain the difference between NewSseqCommand and DeclareSseqCommand! -The \xparsepkg\ package provides these very powerful commands for defining macros. They are used internally to the \sseqpages\ package to define |\class|, |\d|, etc. To help you create variants of these commands, I will record here the argument specifications for each of them. See the \href{\xparseurl}{\xparsepkg\ manual} for a better explanation and more information. - -To make a command like |\class|, you can use the argument specification |O{}r()|. The argument type \texttt{O\marg{default}} stands for a bracket delimited optional argument with default value \meta{default}. In this case, we've specified the default to be empty. |r()| stands for a ``required'' argument delimited by |(| and |)|. In the command definition, access the optional argument with |#1| and the coordinate with |#2|. +The \xparsepkg\ package provides these very powerful commands for defining +macros. They are used internally to the \sseqpages\ package to define |\class|, +|\d|, etc. To help you create variants of these commands, I will record here the +argument specifications for each of them. See the \href{\xparseurl}{\xparsepkg\ +manual} for a better explanation and more information. + +To make a command like |\class|, you can use the argument specification +|O{}r()|. The argument type \texttt{O\marg{default}} stands for a bracket +delimited optional argument with default value \meta{default}. In this case, +we've specified the default to be empty. |r()| stands for a ``required'' +argument delimited by |(| and |)|. In the command definition, access the +optional argument with |#1| and the coordinate with |#2|. \begin{codeexample}[width = 6.5cm,vbox] \DeclareDocumentCommand\demo{ O{} r() } { \#1 = \textcolor{purple}{\{#1\}}; @@ -1014,7 +1472,14 @@ To make a command like |\class|, you can use the argument specification |O{}r()| \hbox{\demo(1,2,3)} \end{codeexample} % TODO: explain what u does better -If you want to separate out the coordinates into different arguments, you can use |O{}u(u,u)|. The argument type |u| stands for ``until'' and scans up until the next instance of the given character. So in this case, |#1| is of argument type |O| which is an option list, |#2| corresponds to the |u(| which is a throw-away argument, then |#3| corresponds to |u,| and contains the $\mathtt{x}$ coordinate, and |#4| corresponds to |u)| and contains the $\mathtt{y}$ coordinate. Note however that this will not match balanced parenthetical expressions. +If you want to separate out the coordinates into different arguments, you can +use |O{}u(u,u)|. The argument type |u| stands for ``until'' and scans up until +the next instance of the given character. So in this case, |#1| is of argument +type |O| which is an option list, |#2| corresponds to the |u(| which is a +throw-away argument, then |#3| corresponds to |u,| and contains the $\mathtt{x}$ +coordinate, and |#4| corresponds to |u)| and contains the $\mathtt{y}$ +coordinate. Note however that this will not match balanced parenthetical +expressions. \begin{codeexample}[width = 6.5cm,vbox] \DeclareDocumentCommand\demo{ O{} u( u, u)} { \#1 = \textcolor{purple}{\{#1\}}; @@ -1028,7 +1493,9 @@ If you want to separate out the coordinates into different arguments, you can us \bigskip \hbox{\demo(1,(1+1)*2)} % uh-oh -- *2) is left off! \end{codeexample} -You can specify an optional argument delimited by parentheses using |d()|. Use the commands |\IfNoValueTF|, |\IfNoValueT|, and |\IfNoValueF| to test whether the user provided a value. +You can specify an optional argument delimited by parentheses using |d()|. Use +the commands |\IfNoValueTF|, |\IfNoValueT|, and |\IfNoValueF| to test whether +the user provided a value. \begin{codeexample}[width = 6.5cm,vbox] \DeclareDocumentCommand\demo{ O{} d() } { \#1 = \textcolor{purple}{\{#1\}}; @@ -1088,8 +1555,14 @@ The |\structline| and |\changeclasses| commands have argument specification |O{} \end{commandlist} \begin{commandlist}{\NewSseqGroup\cmdarg{command}\marg{argspec}\marg{body}, - \DeclareSseqGroup\cmdarg{command}\marg{argspec}\marg{body}} -These are similar to |\NewSseqCommand| and |\DeclareSseqCommand| except that the commands defined take an optional square bracket delimited options list, followed by an optional parenthesis delimited |(x,y)| pair and wraps the body of the code in |\begin{scope}[xshift = \meta{xcoord}, yshift = \meta{ycoord}, options]|. + \DeclareSseqGroup\cmdarg{command}\marg{argspec}\marg{body}}% +These are similar to |\NewSseqCommand| and |\DeclareSseqCommand| except that the +commands defined take an optional square bracket delimited options list, +followed by an optional parenthesis delimited |(x,y)| pair and wraps the body of +the code in% +\begin{center} +|\begin{scope}[xshift = \meta{xcoord}, yshift = \meta{ycoord}, options]|. +\end{center} For instance: \begin{codeexample}[width = 8cm] \DeclareSseqGroup\tower {m} { @@ -1104,49 +1577,73 @@ For instance: \tower(1,1){2} \end{sseqpage} \end{codeexample} -Here we define a command which takes an options list, a coordinate, and a single mandatory argument. The options are applied to all the classes and structlines, the coordinate shifts the origin, and the mandatory argument is the length of the tower. +Here we define a command which takes an options list, a coordinate, and a single +mandatory argument. The options are applied to all the classes and structlines, +the coordinate shifts the origin, and the mandatory argument is the length of +the tower. \end{commandlist} -\begin{command}{\SseqCopyPage\cmdarg{command}\marg{spectral sequence name}\marg{page}} -This defines \cmdarg{command} to print all of the classes and structlines on page |\meta{page}| of the spectral sequence named |\meta{spectral sequence name}|, throwing out differentials and tikz primitives. The resulting command has syntax as if you had used |\DeclareSseqGroup| with no extra arguments -- that is, it takes an optional options list, which are passed to a scope, and an optional coordinate pair. +\begin{command}{\SseqCopyPage\cmdarg{command}\marg{spectral sequence name}\marg{page}}% +This defines \cmdarg{command} to print all of the classes and structlines on +page |\meta{page}| of the spectral sequence named% +|\meta{spectral sequence name}|, throwing out differentials and tikz primitives. +The resulting command has syntax as if you had used |\DeclareSseqGroup| with no +extra arguments -- that is, it takes an optional options list, which are passed +to a scope, and an optional coordinate pair. \end{command} \subsection{Families} -\spectralsequences\ has a concept of ``class families'' that can be drawn or suppressed as a group, and that can have styling options applied to them as a group. -\begin{command}{\SseqNewFamily\marg{family name}} -This makes a new family with name \meta{family name}. The effect of this is to define global options |\meta{family name} style| which apply options to all classes in the family, |draw \meta{family name}| which causes the family to be drawn, and |no \meta{family name}| which suppresses the family (drawing is the default behavior of course). It also defines an option |\meta{family name}| which puts a feature into the family -- so it can be used as an option to any of the normal commands like |\class|, |\d|, |\structline|, etc and to a scope. +\spectralsequences\ has a concept of ``class families'' that can be drawn or +suppressed as a group, and that can have styling options applied to them as a +group. +\begin{command}{\SseqNewFamily\marg{family name}}% +This makes a new family with name \meta{family name}. The effect of this is to +define global options |\meta{family name} style| which apply options to all +classes in the family, |draw \meta{family name}| which causes the family to be +drawn, and |no \meta{family name}| which suppresses the family (drawing is the +default behavior of course). It also defines an option |\meta{family name}| +which puts a feature into the family -- so it can be used as an option to any of +the normal commands like |\class|, |\d|, |\structline|, etc and to a scope. \codeexample[vbox, from file=imJ] \end{command} \subsection{Utilities} -\begin{command}{\SseqParseInt\cmdarg{macro}\marg{integer expression}} -Stores the result of evaluating an integer expression into \cmdarg{macro}. An integer expression consists of |+|, |-|, |*|, |/|, parentheses, and macros that expand to more of the same. The exact rules regarding what is a valid expression are pretty much what you would expect. Note that juxtaposition is a syntax error, not multiplication, so |2(1+1)| is invalid, you must say |2*(1+1)|. +\begin{command}{\SseqParseInt\cmdarg{macro}\marg{integer expression}}% +Stores the result of evaluating an integer expression into \cmdarg{macro}. An +integer expression consists of |+|, |-|, |*|, |/|, parentheses, and macros that +expand to more of the same. The exact rules regarding what is a valid expression +are pretty much what you would expect. Note that juxtaposition is a syntax +error, not multiplication, so |2(1+1)| is invalid, you must say |2*(1+1)|. \end{command} \begin{commandlist}{ \SseqIfEmptyTF\marg{expression}\marg{true code}\marg{false code}, \SseqIfEmptyT\marg{expression}\marg{true code}, \SseqIfEmptyF\marg{expression}\marg{false code} -} -This tests if an expression is the empty expression. This is mainly useful for giving systematic labels to things. +}% +This tests if an expression is the empty expression. This is mainly useful for +giving systematic labels to things. \end{commandlist} \begin{commandlist}{ \IfExistsTF\marg{page}\pararg{coordinate}\marg{true code}\marg{false code}, \IfExistsT\marg{page}\pararg{coordinate}\marg{true code}, \IfExistsF\marg{page}\pararg{coordinate}\marg{false code} -} -Test whether a class of the given description exists. The description can be any valid coordinate, including a named coordinate. If the coordinate is not valid, this will return false. +}% +Test whether a class of the given description exists. The description can be any +valid coordinate, including a named coordinate. If the coordinate is not valid, +this will return false. \end{commandlist} \begin{commandlist}{ \IfAliveTF\marg{page}\pararg{coordinate}\marg{true code}\marg{false code}, \IfAliveT\marg{page}\pararg{coordinate}\marg{true code}, \IfAliveF\marg{page}\pararg{coordinate}\marg{false code} -} -Test whether a class is alive on the given page. If the class doesn't exist, this will return false. +}% +Test whether a class is alive on the given page. If the class doesn't exist, +this will return false. \end{commandlist} \begin{commandlist}{ @@ -1156,8 +1653,9 @@ Test whether a class is alive on the given page. If the class doesn't exist, thi \IfInBoundsTF\pararg{coordinate}\marg{true code}\marg{false code}, \IfInBoundsT\pararg{coordinate}\marg{true code}, \IfInBoundsF\pararg{coordinate}\marg{false code} -} -Test whether a class is in bounds or out of bounds. If no such class exists, returns false. +}% +Test whether a class is in bounds or out of bounds. If no such class exists, +returns false. \end{commandlist} \begin{commandlist}{ @@ -1168,15 +1666,28 @@ Test whether a class is in bounds or out of bounds. If no such class exists, ret \DrawIfValidDifferentialT\ooptions\meta{page}\pararg{coordinate}\opt{\pararg{target coordinate}}\marg{true code}, \DrawIfValidDifferentialF\ooptions\meta{page}\pararg{coordinate}\opt{\pararg{target coordinate}}\marg{false code}, \DrawIfValidDifferential\ooptions\meta{page}\pararg{coordinate}\opt{\pararg{target coordinate}}\marg{false code} -} -Test whether a differential is valid. There are many possible reasons for a differential to not be valid -- the source or target class could not exist, the target could not be in the correct grading, etc. If any error would be generated if you supplied the same arguments to |\d|, this tests false. Otherwise, this tests true. The command |\DrawIfValidDifferental| draws the differential if it is valid, whereas |\DrawIfValidDifferentalT| draws the differential and executes the true code if it is valid, -|\DrawIfValidDifferentalF| draws the differential or executes false code if it isn't valid, etc. +}% +Test whether a differential is valid. There are many possible reasons for a +differential to not be valid -- the source or target class could not exist, the +target could not be in the correct grading, etc. If any error would be generated +if you supplied the same arguments to |\d|, this tests false. Otherwise, this +tests true. The command |\DrawIfValidDifferental| draws the differential if it +is valid, whereas |\DrawIfValidDifferentalT| draws the differential and executes +the true code if it is valid, |\DrawIfValidDifferentalF| draws the differential +or executes false code if it isn't valid, etc. \end{commandlist} \begin{command}{\SseqNormalizeMonomial} -This command simplifies a monomial by combining like variables and removing bases that are raised to the 0th power, removing exponents of 1, removing 1's, and replacing the empty monomial with 1. The variables are sorted by first occurrence, use |\SseqNormalizeMonomialSetVariables| to set a different sort order. It outputs its result into |\result|. This command is specifically meant to be used as a value for |class label handler| or |class name handler|. See the example in the documentation for |class label handler| for a realistic example. The exponents must be integers or else it will misbehave. +This command simplifies a monomial by combining like variables and removing +bases that are raised to the 0th power, removing exponents of 1, removing 1's, +and replacing the empty monomial with 1. The variables are sorted by first +occurrence, use |\SseqNormalizeMonomialSetVariables| to set a different sort +order. It outputs its result into |\result|. This command is specifically meant +to be used as a value for |class label handler| or |class name handler|. See the +example in the documentation for |class label handler| for a realistic example. +The exponents must be integers or else it will misbehave. \begin{codeexample}[] \SseqNormalizeMonomial{x^0y^0} $\result$, \quad \SseqNormalizeMonomial{x^3yx^{-1}z^0} $\result$, \quad @@ -1185,7 +1696,10 @@ This command simplifies a monomial by combining like variables and removing base \end{command} \begin{command}{\SseqNormalizeMonomialSetVariables} -This command takes an undelimited list sets up |\SseqNormalizeMonomial| to sort the variables in the input in the specified order. This is useful for consistency, and particularly important for when you use it to name classes. For example: +This command takes an undelimited list sets up |\SseqNormalizeMonomial| to sort +the variables in the input in the specified order. This is useful for +consistency, and particularly important for when you use it to name classes. +For example: \begin{codeexample}[] % We always want a first, then b, then x_1, then x_2, then x_3 \SseqNormalizeMonomialSetVariables{abx_1x_2x_3} @@ -1198,21 +1712,41 @@ This command takes an undelimited list sets up |\SseqNormalizeMonomial| to sort \begin{command}{\SseqAHSSNameHandler} -This command expects an argument of the form |\meta{monomial}[\meta{integer expression}]| and defines |\result| to be |m[n]| where |m| is the result of applying |\SseqNormalizeMonomial| to the monomial, and |n| is the result of evaluation the integer expression plus any |yshift| that is present. This is intended for use with in drawing Atiyah Hirzebruch spectral sequences. See |class name handler| for an example of the calculation of $KO^*\mathbb{R}P^8$. +This command expects an argument of the form% +|\meta{monomial}[\meta{integer expression}]| and defines |\result| to be |m[n]| +where |m| is the result of applying |\SseqNormalizeMonomial| to the monomial, +and |n| is the result of evaluation the integer expression plus any |yshift| +that is present. This is intended for use with in drawing Atiyah Hirzebruch +spectral sequences. See |class name handler| for an example of the calculation +of $KO^*\mathbb{R}\mathrm{P}^8$. \end{command} \subsection{Coordinate parsers and related} % \parsecoordinate and \parsedifferential -\begin{command}{\parsecoordinate\cmdarg{macro}(\meta{coordinate})} -This command parses the coordinate and puts the triple |(x,y,n)| into \cmdarg{macro}. It also puts the components of the coordinate into macros, for instance if \cmdarg{macro} is |\coord|, then |\xcoord| will contain the x coordinate, |\ycoord| will contain the y coordinate, and |\ncoord| will contain the index. The coordinate can be anything that would be valid to use in a differential or structure line; this is the macro that is used internally to handle coordinates. +\begin{command}{\parsecoordinate\cmdarg{macro}(\meta{coordinate})}% +This command parses the coordinate and puts the triple |(x,y,n)| into +\cmdarg{macro}. It also puts the components of the coordinate into macros, for +instance if \cmdarg{macro} is |\coord|, then |\xcoord| will contain the x +coordinate, |\ycoord| will contain the y coordinate, and |\ncoord| will contain +the index. The coordinate can be anything that would be valid to use in a +differential or structure line; this is the macro that is used internally to +handle coordinates. \end{command} -\begin{command}{\getdtarget\cmdarg{macro}\marg{page}\pars{\sourcecoord}} -Sets \cmdarg{macro} equal to the coordinates of the target position of a length \meta{page} differential starting at \sourcecoord. This helps to make commands that draw fancy differentials. +\begin{command}{\getdtarget\cmdarg{macro}\marg{page}\pars{\sourcecoord}}% +Sets \cmdarg{macro} equal to the coordinates of the target position of a length +\meta{page} differential starting at \sourcecoord. This helps to make commands +that draw fancy differentials. \end{command} -\begin{command}{\parsedifferential\meta{page}(\meta{differential coordinate})\opt{\pararg{differential target}}} -This has the same weird syntax of |\d|, except that you are required to put braces around the page (if it has multiple digits) and you are required to provide at least one coordinate (you have to say |\parsedifferential{2}(\lastclass)| for instance). This command is similar in effect to saying both |\parsecoordinate\source\meta{source coordinate}| and |\parsecoordinate\target\meta{target coordinate}|, but it handles determination of the target coordinate for you. +\begin{command}{\parsedifferential\meta{page}(\meta{differential coordinate})\opt{\pararg{differential target}}}% +This has the same weird syntax of |\d|, except that you are required to put +braces around the page (if it has multiple digits) and you are required to +provide at least one coordinate (you have to say +|\parsedifferential{2}(\lastclass)| for instance). This command is similar in +effect to saying both |\parsecoordinate\source\meta{source coordinate}| and +|\parsecoordinate\target\meta{target coordinate}|, but it handles determination +of the target coordinate for you. For instance, consider the following example, suggested by Catherine Ray: @@ -1253,16 +1787,24 @@ For instance, consider the following example, suggested by Catherine Ray: \end{codeexample} \end{command} -\begin{command}{\nameclass\marg{name}\pararg{coordinate}} -The |\nameclass| command gives a name to a class. It's similar to saying |\doptions[name = |\meta{name}|]|, but faster. It's also similar to saying |\pushstack|\pararg{coordinate}. Giving temporary names to coordinates that you are going to use repeatedly makes the code easier to read and is faster (though this only matters in very large charts). See |\getdtarget| for an example. +\begin{command}{\nameclass\marg{name}\pararg{coordinate}}% +The |\nameclass| command gives a name to a class. It's similar to saying +|\doptions[name = |\meta{name}|]|, but faster. It's also similar to saying +|\pushstack|\pararg{coordinate}. Giving temporary names to coordinates that you +are going to use repeatedly makes the code easier to read and is faster (though +this only matters in very large charts). See |\getdtarget| for an example. \end{command} -\begin{command}{\tagclass\marg{tag}\pararg{coordinate}} -The |\tagclass| command gives a tag to a class. It's similar to saying |\doptions[tag = |\meta{name}|]|, but faster. See \example{tmfmayss} for a use case for this. +\begin{command}{\tagclass\marg{tag}\pararg{coordinate}}% +The |\tagclass| command gives a tag to a class. It's similar to saying +|\doptions[tag = |\meta{name}|]|, but faster. See \example{tmfmayss} for a use +case for this. \end{command} -\begin{command}{\gettag\cmdarg{macro}\pararg{coordinate}} -The |\gettag| command finds the most recent tag applied to the coordinate and stores it into |\cmdarg{macro}|. This is useful for connecting groups of nodes. For example, consider the following code, inspired by \example{tmfmayss}. +\begin{command}{\gettag\cmdarg{macro}\pararg{coordinate}}% +The |\gettag| command finds the most recent tag applied to the coordinate and +stores it into |\cmdarg{macro}|. This is useful for connecting groups of nodes. +For example, consider the following code, inspired by \example{tmfmayss}. \begin{codeexample}[width=6cm] \DeclareSseqCommand \tower { O{} } { \begin{scope}[#1] @@ -1305,15 +1847,18 @@ The |\gettag| command finds the most recent tag applied to the coordinate and st \subsection{The class stack} -\label{sec:class stack} -The class stack is a linked list of the classes in the order that they are produced that \sseqpages\ maintains. I've only recently implemented this feature, so it is more liable to change in the future than other things. Whenever you use the |\class| function, the class you added is pushed onto the stack. Here's an example that demonstrates basic usage: - +\label{sec:class stack}% +The class stack is a linked list of the classes in the order that they are +produced that \sseqpages\ maintains. Whenever you use the |\class| or +|\replaceclass| command, the class you added is pushed onto the stack. The following commands are used to access the stack: -\begin{commandlist}{\lastx\opt{\meta{n}},\lasty\opt{\meta{n}},\lastclass\opt{\meta{n}}} -The commands |\lastx| and |\lasty| evaluate to the |x| and |y| position, respectively, of the $n$th class on the stack. If $n = 0$ you can leave it off. -The command |\lastclass| evaluates to the coordinate of the most recent class on the stack. This is useful for writing turtle-style code: +\begin{commandlist}{\lastx\opt{\meta{n}},\lasty\opt{\meta{n}},\lastclass\opt{\meta{n}}}% +The commands |\lastx| and |\lasty| evaluate to the |x| and |y| position, +respectively, of the $n$th class on the stack. If $n = 0$ you can leave it off. +The command |\lastclass| evaluates to the coordinate of the most recent class on +the stack. This is useful for writing turtle-style code: \begin{codeexample}[width=6cm] \DeclareSseqCommand \etaclass {}{ \class(\lastx+1,\lasty+1) @@ -1336,7 +1881,10 @@ The command |\lastclass| evaluates to the coordinate of the most recent class on \end{sseqpage} \end{codeexample} -You can use |\lastx| and |\lasty| in other contexts than in the body of a \sseqpages\ command, most notably inside |\SseqParseInt| (they also go fine inside |\pgfmathparse| if you need it or one of its siblings). For instance, consider the following tower command: +You can use |\lastx| and |\lasty| in other contexts than in the body of a +\sseqpages\ command, most notably inside |\SseqParseInt| (they also work +correctly when used inside of |\pgfmathparse| and its siblings). For instance, +consider the following tower command: \begin{codeexample}[width=6cm] \DeclareSseqCommand \tower { } { \savestack @@ -1356,17 +1904,28 @@ You can use |\lastx| and |\lasty| in other contexts than in the body of a \sseqp \end{commandlist} -\begin{command}{\pushstack\pararg{coordinate}} -This adds a class to the top of the stack. The coordinate is specified using the same syntax as a coordinate for |\structline| or |\replaceclass|. +\begin{command}{\pushstack\pararg{coordinate}}% +This adds a class to the top of the stack. The coordinate is specified using the +same syntax as a coordinate for |\structline| or |\replaceclass|. \end{command} -\begin{commandlist}{\savestack,\restorestack} -This saves and reverts the stack. Saves nest. Most frequently, you will want to use these at the start and end of a command. +\begin{commandlist}{\savestack,\restorestack}% +This saves and reverts the stack. Saves nest. Most frequently, you will want to +use these at the start and end of a command. \end{commandlist} -\section{Styles} -The \sseqpages\ package has a large number of styles which control the appearance of specific components (e.g., classes, differentials, or structure lines) of a spectral sequence. Each style has two corresponding keys: |classes| and |change classes|. Saying |classes = |\marg{keys} adds the keys to the list of options used to style every future class, whereas |change classes = |\marg{keys} only makes sense in a \sseqpageenv\ environment, and temporarily overwrites the list of options. Note that |change classes| only applies to classes that existed before the current page, and that even with the |keep changes| option, the |change classes| options are local to the current page. Compare: +\section{Styles}% +The \sseqpages\ package has a large number of styles which control the +appearance of specific components (e.g., classes, differentials, or structure +lines) of a spectral sequence. Each style has two corresponding keys: |classes| +and |change classes|. Saying |classes = |\marg{keys} adds the keys to the list +of options used to style every future class, whereas% +|change classes = |\marg{keys} only makes sense in a \sseqpageenv\ environment, +and temporarily overwrites the list of options. Note that |change classes| only +applies to classes that existed before the current page, and that even with the +|keep changes| option, the |change classes| options are local to the current +page. Compare: \begin{codeexample}[width = 8cm] \begin{sseqdata}[ name = style example ] \class(0,0)\class(1,1) @@ -1384,9 +1943,19 @@ The \sseqpages\ package has a large number of styles which control the appearan \end{sseqpage} \end{codeexample} -You can modify these styles outside of a spectral sequence or inside it using |\sseqset|, you can modify them as options to the \sseqdataenv\ and \sseqpageenv\ environments, or you can modify them as arguments to the \scopeenv\ environment. +You can modify these styles outside of a spectral sequence or inside it using +|\sseqset|, you can modify them as options to the \sseqdataenv\ and +\sseqpageenv\ environments, or you can modify them as arguments to the +\scopeenv\ environment. -In cases where the same drawing feature is affected by multiple of these styles, the more specific style takes precedence. For instance, for a class that is the source or target of a differential on the current page, the precedence order from lowest to highest goes: |sseq style|, |class style|, |transient cycle style|, |this page cycle style|, and then any options from scopes in the order they appear, and any local options (the options that come right with the class, e.g., |\class[local options](x,y)|). If you don't want the options to your scopes to override more specific styles, use |sseq|: +In cases where the same drawing feature is affected by multiple of these styles, +the more specific style takes precedence. For instance, for a class that is the +source or target of a differential on the current page, the precedence order +from lowest to highest goes: |sseq style|, |class style|,% +|transient cycle style|, |this page cycle style|, and then any options from +scopes in the order they appear, and any local options (the options that come +right with the class, e.g., |\class[local options](x,y)|). If you don't want the +options to your scopes to override more specific styles, use |sseq|: \begin{codeexample}[width = 7cm] \begin{sseqpage}[ classes = { blue, fill }, title style = { align = center, text width = 2.4cm }, @@ -1409,8 +1978,10 @@ In cases where the same drawing feature is affected by multiple of these styles, Throughout, ``class'' and ``cycle'' are synonyms. -\begin{stylekeylist}{sseqs, change sseqs,sseq,change sseq} -This passes options to all features in all future spectral sequences in the current scope. Note that for many global options you can set a default directly by saying |\sseqset{key = \marg{value}}| and this is in some cases preferable. +\begin{stylekeylist}{sseqs, change sseqs,sseq,change sseq}% +This passes options to all features in all future spectral sequences in the +current scope. Note that for many global options you can set a default directly +by saying |\sseqset{key = \marg{value}}| and this is in some cases preferable. \begin{codeexample}[width = 7cm] % Applies to both of the following sseqs: @@ -1443,8 +2014,16 @@ This passes options to all features in all future spectral sequences in the curr \end{stylekeylist} -\begin{stylekeylist}{permanent classes, permanent cycles, change permanent classes, change permanent cycles} -These options change the appearance of all permanent cycles (e.g., those classes which never support or are hit by a differential). For instance, we can circle the permanent cycles automatically. In the following example, note that because |permanent cycles| is more specific than |classes|, the |permanent cycles = {draw}| command takes precedence over the |classes = {draw = none}| command and the permanent cycle nodes are drawn. +\begin{stylekeylist}{% + permanent classes, permanent cycles,% + change permanent classes, change permanent cycles% +}% +These options change the appearance of all permanent cycles (e.g., those classes +which never support or are hit by a differential). For instance, we can circle +the permanent cycles automatically. In the following example, note that because +|permanent cycles| is more specific than |classes|, the% +|permanent cycles = {draw}| command takes precedence over the% +|classes = {draw = none}| command and the permanent cycle nodes are drawn. \begin{codeexample}[width = 6.5cm] \begin{sseqpage}[ cohomological Serre grading, classes = { draw = none }, @@ -1457,8 +2036,13 @@ These options change the appearance of all permanent cycles (e.g., those classes \end{codeexample} \end{stylekeylist} -\begin{stylekeylist}{transient classes, transient cycles,change transient classes,change transient cycles} -These options change the appearance of all transient cycles (e.g., those classes which eventually support or are hit by a differential). Again, this takes precedence over the |classes| option. +\begin{stylekeylist}{ + transient classes, transient cycles, + change transient classes,change transient cycles +}% +These options change the appearance of all transient cycles (e.g., those classes +which eventually support or are hit by a differential). Again, this takes +precedence over the |classes| option. \begin{codeexample}[width = 6.5cm] \begin{sseqpage}[ cohomological Serre grading, classes = { draw = none }, @@ -1471,8 +2055,14 @@ These options change the appearance of all transient cycles (e.g., those classes \end{codeexample} \end{stylekeylist} -\begin{stylekeylist}{this page classes, this page cycles, change this page classes,change this page cycles} -These options change the appearance of all cycles which support or are hit by a differential on this page. Any class that is hit on the current page is also a transient cycle, and so |this page classes| takes precedence over |transient cycles|. +\begin{stylekeylist}{% + this page classes, this page cycles,% + change this page classes,change this page cycles% +}% +These options change the appearance of all cycles which support or are hit by a +differential on this page. Any class that is hit on the current page is also a +transient cycle, and so |this page classes| takes precedence over% +|transient cycles|. \begin{codeexample}[width = 6cm] \begin{sseqdata}[ name = this page cycles example, Adams grading, transient cycles = { red, fill }, this page cycles = { blue } ] @@ -1486,12 +2076,17 @@ These options change the appearance of all cycles which support or are hit by a \end{codeexample} \end{stylekeylist} -\begin{stylekeylist}{edges,differentials,struct lines, change edges, change differentials, change struct lines} -The |edges| key applies to both differentials and structure lines. The |differentials| and |struct lines| keys both take precedence over |edges|. +\begin{stylekeylist}{ + edges,differentials,struct lines, + change edges, change differentials, change struct lines +}% +The |edges| key applies to both differentials and structure lines. The +|differentials| and |struct lines| keys both take precedence over |edges|. \end{stylekeylist} -\begin{stylekeylist}{this page struct lines, change this page struct lines} -This style applies to structure lines whose source or target is hit on the current page. It takes precedence over |struct lines|. +\begin{stylekeylist}{this page struct lines, change this page struct lines}% +This style applies to structure lines whose source or target is hit on the +current page. It takes precedence over |struct lines|. \end{stylekeylist} \begin{stylekeylist}{tikz primitives,change tikz primitives} @@ -1499,13 +2094,17 @@ Applies to all \tikzpkg\ primitives. \end{stylekeylist} -\begin{stylekeylist}{labels,change labels} -This style applies to labels on classes, differentials, and structure lines. All the more specific label styles take precedence over it. +\begin{stylekeylist}{labels,change labels}% +This style applies to labels on classes, differentials, and structure lines. All +the more specific label styles take precedence over it. \end{stylekeylist} -\begin{stylekeylist}{class labels,inner class labels,outer class labels, - change class labels,change inner class labels,change outer class labels} -Inner class labels specifically applies to class labels that are inside the node, outer class labels specifically applies to ones outside it: +\begin{stylekeylist}{ + class labels,inner class labels,outer class labels, + change class labels,change inner class labels,change outer class labels +}% +Inner class labels specifically applies to class labels that are inside the +node, outer class labels specifically applies to ones outside it: \begin{codeexample}[] \begin{sseqpage}[ no axes, classes = { inner sep = 1pt }, label distance = 2pt, @@ -1517,17 +2116,22 @@ Inner class labels specifically applies to class labels that are inside the node \end{codeexample} \end{stylekeylist} -\begin{stylekeylist}{edge labels,differential labels,struct line labels, - change edge labels,change differential labels,change struct line labels} +\begin{stylekeylist}{ + edge labels,differential labels,struct line labels, + change edge labels,change differential labels,change struct line labels +}% \end{stylekeylist} \subsection{Style-like options} -The options are not styles, but can be modified in the same set of places (namely, anywhere): +The options are not styles, but can be modified in the same set of places +(namely, anywhere): -\begin{keylist}{label distance = \meta{dimension}} -This sets the default distance from a class to an outer label. There are also variants like |above label distance| corresponding to |above|, |below|, |left|, |right|, |above left|, |above right|, |below left|, and |below right|. +\begin{keylist}{label distance = \meta{dimension}}% +This sets the default distance from a class to an outer label. There are also +variants like |above label distance| corresponding to |above|, |below|, |left|, +|right|, |above left|, |above right|, |below left|, and |below right|. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ label distance = 0.3em, right label distance = 0em, @@ -1542,10 +2146,14 @@ This sets the default distance from a class to an outer label. There are also va \begin{keylist}{run off = \meta{start tip}--\meta{end tip}, run off struct lines = \meta{start tip}--\meta{end tip} (initially {...--...}), - run off differentials = \meta{start tip}--\meta{end tip} (initially {...--...})} -Change the default behavior of run off edges for either all edges, just structure lines, or just differentials respectively. Local arrowhead options override this. - -If an edge runs off the edge of the clipping, \sseqpages\ automatically add an arrowhead to indicate that the edge continues. This option controls which arrow head is added if the start or end of an edge runs off the page. + run off differentials = \meta{start tip}--\meta{end tip} (initially {...--...})}% +Change the default behavior of run off edges for either all edges, just +structure lines, or just differentials respectively. Local arrowhead options +override this. + +If an edge runs off the edge of the clipping, \sseqpages\ automatically add an +arrowhead to indicate that the edge continues. This option controls which arrow +head is added if the start or end of an edge runs off the page. \begin{codeexample}[width = 6cm] \begin{sseqpage}[ x range = {0}{2}, y range = {0}{2}, draw orphan edges, run off = >-stealth ] @@ -1559,12 +2167,22 @@ If an edge runs off the edge of the clipping, \sseqpages\ automatically add an a \end{keylist} \begin{key}{class label handler = \meta{function}} -\declarecustomhandler{class label handler}{\codehandler} -The value of |class label handler| is a function that is applied to all labels before displaying them. It should put its output into |\result|. -This is intended to help with code reusability. Because these handlers may crash or have annoying side-effects on some input, you may want to toggle the value of this command on and off. To turn this off for the rest of the current spectral sequence you can say |\sseqset{class label handler = {}}|. You can also use the |class label handler| key in a \scopeenv. - -The main function \sseqpages\ provides for use here is |\SseqNormalizeMonomial{#1}|. This makes it convenient to translate expressions with polynomial labels. You can write your own handlers if your \TeX\ programming skills are sufficient. Let me know if there are any other functions that you want here, and if you implement them yourself, please send me your implementation. -Here is an example of a function that evaluates an arithmetic expression: +\declarecustomhandler{class label handler}{\codehandler}% +The value of |class label handler| is a function that is applied to all labels +before displaying them. It should put its output into |\result|. This is +intended to help with code reusability. Because these handlers may crash or have +annoying side-effects on some input, you may want to toggle the value of this +command on and off. To turn this off for the rest of the current spectral +sequence you can say |\sseqset{class label handler = {}}|. You can also use the +|class label handler| key in a \scopeenv. + +The main function \sseqpages\ provides for use here is +|\SseqNormalizeMonomial{#1}|. This makes it convenient to translate expressions +with polynomial labels. You can write your own handlers if your \TeX\ +programming skills are sufficient. Let me know if there are any other functions +that you want here, and if you implement them yourself, please send me your +implementation. Here is an example of a function that evaluates an arithmetic +expression: \begin{codeexample}[width=6cm] \begin{sseqpage}[ class label handler = { \SseqParseInt\result{#1} } @@ -1591,7 +2209,12 @@ Here's an example using |\SseqNormalizeMonomial|: \end{sseqpage} \end{codeexample} -Here is another example which demonstrates a useful idiom for drawing Serre spectral sequences. For a more complete example, see \example{KF3n}. Note the use of braces in |{Sq^1\iota_2}|. Without braces, |\SseqNormalizeMonomial| will simplify |Sq^1xSq^2x| into $S^2q^3x^2$, which is obviously undesirable, so the correct way to input this is |{Sq^1x}{Sq^2x}|. Unfortunately, |\foreach| strips a pair of braces from its arguments, so you need to put two pairs of braces. +Here is another example which demonstrates a useful idiom for drawing Serre +spectral sequences. For a more complete example, see \example{KF3n}. Note the +use of braces in |{Sq^1\iota_2}|. Without braces, |\SseqNormalizeMonomial| will +simplify |Sq^1xSq^2x| into $S^2q^3x^2$, which is obviously undesirable, so the +correct way to input this is |{Sq^1x}{Sq^2x}|. Unfortunately, |\foreach| strips +a pair of braces from its arguments, so you need to put two pairs of braces. %\pgfmanualpdflabel{normalizemonomialex-labels} \begin{codeexample}[width=8cm] \begin{sseqpage}[ @@ -1612,9 +2235,15 @@ Here is another example which demonstrates a useful idiom for drawing Serre spec \begin{key}{class name handler = \meta{function}} -\declarecustomhandler{class name handler}{\codehandler} -The value of |class name handler| is a function that is applied to all names before using them. It should put its output into |\result|. -The main functions intended for use here are |\SseqAHSSNameHandler| and |\SseqNormalizeMonomial|, though you can make your own. This is applied both when you name the class, as in \codeverb|\class[name=a](\meta{coordinate})| and when you refer to a class by name, as in |\structline(a)(b)|. One advantage if you are using |\SseqNormalizeMonomial| is that you can ensure that |xy| and |yx| refer to the same class: +\declarecustomhandler{class name handler}{\codehandler}% +The value of |class name handler| is a function that is applied to all names +before using them. It should put its output into |\result|. The main functions +intended for use here are |\SseqAHSSNameHandler| and |\SseqNormalizeMonomial|, +though you can make your own. This is applied both when you name the class, as +in \codeverb|\class[name=a](\meta{coordinate})| and when you refer to a class by +name, as in |\structline(a)(b)|. One advantage if you are using +|\SseqNormalizeMonomial| is that you can ensure that |xy| and |yx| refer to the +same class: \begin{codeexample}[] \SseqNormalizeMonomialSetVariables{xy} \begin{sseqpage}[ class name handler = \SseqNormalizeMonomial, @@ -1625,7 +2254,8 @@ The main functions intended for use here are |\SseqAHSSNameHandler| and |\SseqNo \structline(yx)(yyx) \end{sseqpage} \end{codeexample} -The next page is an example drawing the Atiyah Hirzebruch spectral sequence computing $KO^*\mathbb{R}P^{8}$. +The next page is an example drawing the Atiyah Hirzebruch spectral sequence +computing $KO^*\mathbb{R}P^{8}$. % Have to load from file so that \afterpage doesn't cause trouble with verbatim reading. \afterpage{% An AHSS using \scantokens{|class name handler = \SseqAHSSNameHandler|:} @@ -1635,29 +2265,79 @@ The next page is an example drawing the Atiyah Hirzebruch spectral sequence comp } \end{key} -\begin{keylist}{class name prefix = \meta{prefix}, class name postfix = \meta{postfix}} -These keys add respectively a prefix or a postfix to all names of all classes in the scope. This is applied both when you name the class, as in \codeverb|\class[name=a](\meta{coordinate})| and when you refer to a class by name, as in |\structline(a)(b)|. -The prefix and postfix are added to the command before the |class name handler| is applied, so if you say |name=\meta{the name}| then the name actually given to the class is the value of |\result| after saying |\classnamehander{\meta{name prefix}\meta{the name}\meta{name postfix}}| +\begin{keylist}{class name prefix = \meta{prefix}, class name postfix = \meta{postfix}}% +These keys add respectively a prefix or a postfix to all names of all classes in +the scope. This is applied both when you name the class, as in +\codeverb|\class[name=a](\meta{coordinate})| and when you refer to a class by +name, as in |\structline(a)(b)|. The prefix and postfix are added to the command +before the |class name handler| is applied, so if you say |name=\meta{the name}| +then the name actually given to the class is the value of |\result| after saying +\begin{center} +|\classnamehander{\meta{name prefix}\meta{the name}\meta{name postfix}}| +\end{center} \end{keylist} \section{Global Options} -These options can only be set at the beginning of a \sseqdataenv\ or \sseqpageenv\ environment. When it makes sense, you can also set a default value using |\sseqset|. Generally, these options either modify the plot style or the logic for the spectral sequence. -\begin{key}{name = \meta{sseq name}} -This option must be used with the \sseqdataenv\ environment where it indicates the name of the spectral sequence, which will be used with the \sseqpageenv\ environment or |\printpage| command to draw the spectral sequence. The name used in a \sseqdataenv\ environment must be new unless the environment is used with the |update existing| key in which case the \sseqdataenv\ environment will add to the existing spectral sequence. It is optional when used with \sseqpageenv\ , and if included the name given must be the name of an existing spectral sequence. +These options can only be set at the beginning of a \sseqdataenv\ or +\sseqpageenv\ environment. When it makes sense, you can also set a default +value using |\sseqset|. Generally, these options either modify the plot style or +the logic for the spectral sequence. +\begin{key}{name = \meta{sseq name}}% +This option must be used with the \sseqdataenv\ environment where it indicates +the name of the spectral sequence, which will be used with the \sseqpageenv\ +environment or |\printpage| command to draw the spectral sequence. The name used +in a \sseqdataenv\ environment must be new unless the environment is used with +the |update existing| key in which case the \sseqdataenv\ environment will add +to the existing spectral sequence. It is optional when used with \sseqpageenv\ , +and if included the name given must be the name of an existing spectral +sequence. \end{key} -\begin{key}{page = \meta{page number}\opt{--\meta{page max} (initially 0)}} -This key is for \sseqpageenv\ and |\printpage|. It specifies which page of the spectral sequence is to be printed. On page r, all |\class|es that are not hit by differentials on pages less than r will be printed, as well as all |\structline|s whose source and target classes are both printed on page r, and all differentials of length exactly r. The special value |page = 0| prints all classes, differentials, and structure lines. - -If you use this key with a range, then all differentials in that range of lengths will be drawn. The larger number only changes which differentials are drawn. If you use 0 for the \meta{page max}, then all differentials longer than \meta{page number} will be drawn. +\begin{key}{page = \meta{page number}\opt{--\meta{page max} (initially 0)}}% +This key is for \sseqpageenv\ and |\printpage|. It specifies which page of the +spectral sequence is to be printed. On page r, all |\class|es that are not hit +by differentials on pages less than r will be printed, as well as all +|\structline|s whose source and target classes are both printed on page r, and +all differentials of length exactly r. The special value |page = 0| prints all +classes, differentials, and structure lines but no extensions. The special value +|page=\infty| will draw the infinity page with extensions. + +If you use this key with a range, e.g., |page=2--5|, then all differentials in +that range of lengths will be drawn, so in the example differentials of length +greater than or equal to 2 and less than or equal to 5 are drawn. The larger +number only changes which differentials are drawn, classes and structlines are +drawn as if the page was the small endpoint of the range. If you use 0 for the +\meta{page max}, then all differentials longer than \meta{page number} will be +drawn, e.g., |page=5---0| draws all differentials of length at least 5, but no +extensions. Using |page=5---\infty| will draw all differentials of length at +least 5 and also all extensions whose endpoint classes are in the +final generation on page 5. \end{key} -\begin{keylist}{degree = \marg{x degree}\marg{y degree},cohomological Serre grading, homological Serre grading, Adams grading} -Specifies the degree of differentials. The \meta{x degree} and \meta{y degree} should both be mathematical expressions in one variable |#1| that evaluate to integers on any input. They specify the $\mathtt{x}$ and $\mathtt{y}$ displacement of a page $\mathtt{\#1}$ differential. In practice, they will be linear expressions with |#1| coefficient 1, -1, or 0. - -The |degree| option must be given before placing any differentials. It can be specified at the beginning of the \sseqdataenv\ environment, at the beginning of the \sseqpageenv\ environment if it is being used as a standalone page, or as a default by saying |\sseqset{degree = \marg{x degree}\marg{y degree}}| or |\sseqset{Adams grading}| outside of the \sseqdataenv\ and \sseqpages\ environments. - -You can make a named grading convention by saying \codeverb|\sseqset{my grading/.sseq grading = \marg{x degree}\marg{y degree}}|. Then later passing |my grading| to a spectral sequence is equivalent to saying |degree = \marg{x degree}\marg{y degree}|. The following grading conventions exist by default: +\begin{keylist}{% + degree = \marg{x degree}\marg{y degree},% + cohomological Serre grading,% + homological Serre grading,% + Adams grading% +}% +Specifies the degree of differentials. The \meta{x degree} and \meta{y degree} +should both be mathematical expressions in one variable |#1| that evaluate to +integers on any input. They specify the $\mathtt{x}$ and $\mathtt{y}$ +displacement of a page $\mathtt{\#1}$ differential. In practice, they will be +linear expressions with |#1| coefficient 1, -1, or 0. + +The |degree| option must be given before placing any differentials. It can be +specified at the beginning of the \sseqdataenv\ environment, at the beginning +of the \sseqpageenv\ environment if it is being used as a standalone page, or +as a default by saying |\sseqset{degree = \marg{x degree}\marg{y degree}}| or +|\sseqset{Adams grading}| outside of the \sseqdataenv\ and \sseqpages\ +environments. + +You can make a named grading convention by saying \codeverb|\sseqset{my +grading/.sseq grading = \marg{x degree}\marg{y degree}}|. Then later passing% +|my grading| to a spectral sequence is equivalent to saying% +|degree = \marg{x degree}\marg{y degree}|. The following grading conventions +exist by default: \begin{codeexample}[width = 6cm] % equivalent to degree = {#1}{1-#1}: \begin{sseqpage}[ cohomological Serre grading ] @@ -1685,7 +2365,9 @@ You can make a named grading convention by saying \codeverb|\sseqset{my grading/ \end{keylist} \begin{keylist}{strict degree, lax degree} -If the degree is strict, then \LaTeX will throw an error if you try to specify a differential that doesn't have the proper grading. The degree is strict by default. +If the degree is strict, then \LaTeX will throw an error if you try to specify a +differential that doesn't have the proper grading. The degree is strict by +default. \begin{codeexample}[code only] \begin{sseqdata}[ name = laxdegree, Adams grading ] \class(0,2) @@ -1706,13 +2388,19 @@ If the degree is strict, then \LaTeX will throw an error if you try to specify a \end{keylist} \begin{key}{update existing} -This key is only for the \sseqdataenv\ environment. It specifies that the current \sseqdataenv\ environment is adding data to an existing spectral sequence. If you don't pass this key, then giving a \sseqdataenv\ environment the same |name| as a different \sseqdataenv\ environment will cause an error. This is intended to help you avoid accidentally reusing the same name. +This key is only for the \sseqdataenv\ environment. It specifies that the +current \sseqdataenv\ environment is adding data to an existing spectral +sequence. If you don't pass this key, then giving a \sseqdataenv\ environment +the same |name| as a different \sseqdataenv\ environment will cause an error. +This is intended to help you avoid accidentally reusing the same name. \end{key} -\begin{key}{keep changes =\meta{boolean} (default true)(initially false)} -This option is only for the \sseqpageenv\ environment, and only works when a |name| is provided. -This option specifies that all of the commands in the current \sseqpageenv\ environment should be carried forward to future pages of the same named spectral sequence. For example: +\begin{key}{keep changes =\meta{boolean} (default true)(initially false)}% +This option is only for the \sseqpageenv\ environment, and only works when a +|name| is provided. This option specifies that all of the commands in the +current \sseqpageenv\ environment should be carried forward to future pages of +the same named spectral sequence. For example: \begin{codeexample}[] \begin{sseqdata}[ name = keep changes example, Adams grading, y range = {0}{3} ] \class(0,0) @@ -1737,20 +2425,31 @@ This option specifies that all of the commands in the current \sseqpageenv\ env \printpage[ name = keep changes example, page = 3 ] \end{codeexample} -Note that the orange classes and differential do not persist because the |keep changes| option is not set in the first \sseqpageenv\ environment, but the blue classes and differential do, since the |keep changes| option is set in the second \sseqpageenv\ environment. +Note that the orange classes and differential do not persist because the +|keep changes| option is not set in the first \sseqpageenv\ environment, but the blue +classes and differential do, since the |keep changes| option is set in the +second \sseqpageenv\ environment. \end{key} \begin{keylist}{no differentials,draw differentials} -The option |no differentials| suppresses all of the differentials on the current page, whereas |draw differentials| causes the page appropriate differentials to be drawn. This is useful for explaining how the computation of a spectral sequence goes, or if you want to display one of the edges of the spectral sequence, like in \example{KF3n}. +The option |no differentials| suppresses all of the differentials on the current +page, whereas |draw differentials| causes the page appropriate differentials to +be drawn. This is useful for explaining how the computation of a spectral +sequence goes, or if you want to display one of the edges of the spectral +sequence, like in \example{KF3n}. \end{keylist} \begin{keylist}{no struct lines,draw struct lines} -The option |no struct lines| suppresses all of the structure lines on the current page, whereas the option |draw struct lines| causes the page appropriate structure lines to be drawn. +The option |no struct lines| suppresses all of the structure lines on the +current page, whereas the option |draw struct lines| causes the page appropriate +structure lines to be drawn. \end{keylist} \begin{keylist}{no orphan edges,draw orphan edges} -An edge is an ``orphan'' if both its source and target lie off the page. By default these are drawn, but with the option |no orphan edges| they are not. If the option |no orphan edges| has been set, |draw orphan edges| undoes it. +An edge is an ``orphan'' if both its source and target lie off the page. By +default these are drawn, but with the option |no orphan edges| they are not. If +the option |no orphan edges| has been set, |draw orphan edges| undoes it. \begin{codeexample}[width = 9cm] \begin{sseqdata}[ name = orphan edges example, @@ -1769,8 +2468,9 @@ An edge is an ``orphan'' if both its source and target lie off the page. By defa \end{keylist} -\begin{key}{class pattern = \meta{class pattern name} (initially standard)} -This key specifies the arrangement of multiple classes at the same coordinate. The default value is |standard|. +\begin{key}{class pattern = \meta{class pattern name} (initially standard)}% +This key specifies the arrangement of multiple classes at the same coordinate. +The default value is |standard|. \begin{codeexample}[width = 5cm] \begin{sseqdata}[ name = class pattern example, no axes, ymirror ] \class(0,0) @@ -1786,11 +2486,12 @@ This key specifies the arrangement of multiple classes at the same coordinate. T class pattern = linear, class placement transform = { rotate = 45 } ] \end{codeexample} -You can add new class patterns using |\sseqnewclasspattern|: -\begin{command}{\sseqnewclasspattern\marg{class pattern name}\marg{offsets}} -Creates a new class pattern. For example, the |linear| class pattern is created using the command: +You can add new class patterns using |\SseqNewClassPattern|: +\begin{command}{\SseqNewClassPattern\marg{class pattern name}\marg{offsets}} +Creates a new class pattern. For example, the |linear| class pattern is created +using the command: \begin{codeexample}[code only] -\sseqnewclasspattern{linear}{ +\SseqNewClassPattern{linear}{ (0,0); (-0.13,0)(0.13,0); (-0.2,0)(0,0)(0.2,0); @@ -1799,14 +2500,29 @@ Creates a new class pattern. For example, the |linear| class pattern is created (-0.5,0)(-0.3,0)(-0.1,0)(0.1,0)(0.3,0)(0.5,0); } \end{codeexample} -For instance the third row indicates that if there are three classes at the position |(x,y)| they should be printed at |(x-0.2,y)|, |(x,y)|, and |(x+0.2,y)|. You can give as many rows as you like; \sseqpages\ will throw an error if there are more classes in any position than the maximum number that your class pattern can handle -- for instance, the |linear| class pattern can handle up to six classes based on this definition. +For instance the third row indicates that if there are three classes at the +position |(x,y)| they should be printed at |(x-0.2,y)|, |(x,y)|, and +|(x+0.2,y)|. You can give as many rows as you like; \sseqpages\ will throw an +error if there are more classes in any position than the maximum number that +your class pattern can handle -- for instance, the |linear| class pattern can +handle up to six classes based on this definition. \end{command} \end{key} -\begin{keylist}{class placement transform = \marg{transform keys}, add class placement transform = \marg{transform keys} } -\declareasstyle{class placement transform}\declareasstyle{add class placement transform} -The option |class placement transform| allows the user to specify a \tikzpkg\ coordinate transform to adjust the relative position of multiple nodes in the same $\mathtt{(x,y)}$ position. The |class placement transform| key overrides the previous value of transformations, the |add class placement transform| just adds the new transformation to the end of the list. This coordinate transform can only involve rotation and scaling, no translation. Specifying a scaling factor helps if the nodes are too large and overlap. In some cases a rotation makes it easier to see which class is the target of a differential. +\begin{keylist}{% + class placement transform = \marg{transform keys},% + add class placement transform = \marg{transform keys}% +}% +\declareasstyle{class placement transform}\declareasstyle{add class placement transform}% +The option |class placement transform| allows the user to specify a \tikzpkg\ +coordinate transform to adjust the relative position of multiple nodes in the +same $\mathtt{(x,y)}$ position. The |class placement transform| key overrides +the previous value of transformations, the |add class placement transform| just +adds the new transformation to the end of the list. This coordinate transform +can only involve rotation and scaling, no translation. Specifying a scaling +factor helps if the nodes are too large and overlap. In some cases a rotation +makes it easier to see which class is the target of a differential. \begin{codeexample}[width = 5cm] \begin{sseqpage}[ class placement transform = { xscale = 1.5 }, class pattern = linear, @@ -1830,7 +2546,8 @@ The option |class placement transform| allows the user to specify a \tikzpkg\ c \draw[->,red](3,0,1)--(0,0); \end{sseqpage} \end{codeexample} -With multiple large class labels, the best option is to arrange the classes vertically: +With multiple large class labels, the best option is to arrange the classes +vertically: \begin{codeexample}[width = 5.5cm] \begin{sseqpage}[ classes = {draw = none }, xscale = 2, yscale=1.55, class pattern = linear, @@ -1854,16 +2571,21 @@ With multiple large class labels, the best option is to arrange the classes vert \end{codeexample} \end{keylist} -\begin{key}{math nodes = \meta{boolean} (default true)(initially true)} +\begin{key}{math nodes = \meta{boolean} (default true)(initially true)}% This key instructs \sseqpages\ to put all labels in math mode automatically. \end{key} \subsection{Global coordinate transformations} -Of the normal \tikzpkg\ coordinate transformations, only the following can be applied to a \sseqpages\ chart: -\begin{keylist}{scale = \meta{factor},xscale = \meta{factor}, yscale = \meta{factor}, xmirror, ymirror} -Scale the chart by \meta{factor}. Under normal circumstances, you can tell \tikzpkg\ to mirror a chart by saying, for instance, |xscale = -1|, but \sseqpages\ needs to be aware that the chart has been mirrored in order to draw the axes correctly. Thus, if you want to mirror a spectral sequence, use the |xmirror| and |ymirror| options as appropriate. +Of the normal \tikzpkg\ coordinate transformations, only the following can be +applied to a \sseqpages\ chart: +\begin{keylist}{scale = \meta{factor},xscale = \meta{factor}, yscale = \meta{factor}, xmirror, ymirror}% +Scale the chart by \meta{factor}. Under normal circumstances, you can tell +\tikzpkg\ to mirror a chart by saying, for instance, |xscale = -1|, but +\sseqpages\ needs to be aware that the chart has been mirrored in order to draw +the axes correctly. Thus, if you want to mirror a spectral sequence, use the +|xmirror| and |ymirror| options as appropriate. \end{keylist} \begin{key}{rotate = \meta{angle}} @@ -1871,8 +2593,30 @@ It probably won't look great if you pick an angle that isn't a multiple of 90 de \end{key} \subsection{Plot options and axes style} -\begin{keylist}{x range = \marg{x min}\marg{x max},y range = \marg{y min}\marg{y max}} -These options set the x range (respectively y range) to be a specific interval. By default, if no range is specified then the range is chosen to fit all the classes. If an x range is specified but no y range, then the y range is chosen to fit all the classes that lie inside the specified x range, and vice versa. The values must be integers -- if you want to extend the x axis a noninteger amount, try using |x axis start extend| or |x axis end extend|. +\begin{keylist}{x range = \marg{x min}\marg{x max},y range = \marg{y min}\marg{y +max}} These options set the x range (respectively y range) to be a specific +interval. By default, if no range is specified then the range is chosen to fit +all the classes. If an x range is specified but no y range, then the y range is +chosen to fit all the classes that lie inside the specified x range, and vice +versa. The values must be integers -- if you want to extend the x axis a +noninteger amount, try using |x axis start extend| or |x axis end extend|. +\end{keylist} + +\begin{keylist}{range check standard (default), range check sideways, range check off} +These options control the range checking behavior. + +By default \sseqpages\ will try to compute whether the chart fits onto the page +(without causing overfull boxes). The computation isn't perfectly accurate and +it assumes that the entire page is available for the chart to use up, so for +instance if the chart is indented because of |\textindent| or not at the top of +the page, this might give overly large values. Also, the values computed aren't +perfectly accurate. + +If the range check is not desirable, you can use |range check off|. If the +diagram is being placed onto the page rotated 90 degrees, then use +% +|range check sideways|. Inside of a \env{sideways} environment from the +\pkg{rotating} package, this is the default. \end{keylist} \begin{keylist}{ @@ -1881,8 +2625,9 @@ These options set the x range (respectively y range) to be a specific interval. grid step = \meta{positive integer}, x grid step = \meta{positive integer}, y grid step = \meta{positive integer} -} -Makes \sseqpages\ draw a grid. The grid types and a significant part of the code that produces them were stolen from the \sseqpkg\ package. +}% +Makes \sseqpages\ draw a grid. The grid types and a significant part of the +code that produces them were stolen from the \sseqpkg\ package. \begin{codeexample}[vbox] \begin{sseqdata}[ name = grid example, scale = 0.8 ] \class(0,0) @@ -1904,15 +2649,30 @@ Makes \sseqpages\ draw a grid. The grid types and a significant part of the cod \printpage[ name = grid example, grid = none ] } \end{codeexample} -It is possible to make your own grid type by defining the command |\sseq@grid@yourgridname| to draw a grid. +It is possible to make your own grid type by defining the command +|\sseq@grid@yourgridname| to draw a grid. -It is a known problem that acrobat reader displays grids very dark and thick. This is caused by the enhance thin lines ``feature'' of Acrobat reader. You can turn it off globally by going into the acrobat reader preferences window and unchecking the ``Enhance thin lines'' checkbox in the ``Rendering'' section. Unfortunately, there is no way to instruct Acrobat Reader to not apply this feature to a particular document. This has apparently been annoying graphic designers for over a decade. +It is a known problem that acrobat reader displays grids very dark and thick. +This is caused by the enhance thin lines ``feature'' of Acrobat reader. You can +turn it off globally by going into the acrobat reader preferences window and +unchecking the ``Enhance thin lines'' checkbox in the ``Rendering'' section. +Unfortunately, there is no way to instruct Acrobat Reader to not apply this +feature to a particular document. This has apparently been annoying graphic +designers for over a decade. The grid color option changes the color of the grid; the default value is |gray|. The grid step keys change the grid step. \end{keylist} -\begin{keylist}{title = \meta{text}, title style = \meta{keys}, x label = \meta{text}, y label = \meta{text},x label style = \meta{keys}, y label style = \meta{keys}, label style = \meta{keys}} +\begin{keylist}{% + title = \meta{text},% + title style = \meta{keys},% + x label = \meta{text},% + y label = \meta{text},% + x label style = \meta{keys},% + y label style = \meta{keys},% + label style = \meta{keys}% +} \declareasstyle{title style} \declareasstyle{x label style} \declareasstyle{y label style} @@ -1929,17 +2689,29 @@ This make chart labels. \class(2,2) \end{sseqpage} \end{codeexample} -Note that if you make multiple versions of the same chart and some of the charts have labels and others don't, they might not align the way you want. An easy solution to this is to use |\path[background] (min x, min y) -- (max x, max y);| where the coordinates are below and to the left, respectively above and to the right, of everything else drawn in any picture. This makes the bounding boxes for all of the pictures the same size, so that they line up even if the exact collection of things drawn changes. See the example at the end of the |background| key for an illustration of this. +Note that if you make multiple versions of the same chart and some of the charts +have labels and others don't, they might not align the way you want. An easy +solution to this is to use |\path[background] (min x, min y) -- (max x, max y);| +where the coordinates are below and to the left, respectively above and to the +right, of everything else drawn in any picture. This makes the bounding boxes +for all of the pictures the same size, so that they line up even if the exact +collection of things drawn changes. See the example at the end of the +|background| key for an illustration of this. \end{keylist} \needspace{5\baselineskip} \begin{keylist}{no title, draw title, no x label, no y label, no labels, draw x label, draw y label, draw labels} -Suppress or unsuppress the title, x label, y label, or both x and y labels, respectively. +Suppress or unsuppress the title, x label, y label, or both x and y labels, +respectively. \end{keylist} \begin{keylist}{no x ticks, no y ticks, no ticks, draw x ticks, draw y ticks, draw ticks} -Suppress axes ticks (the numbers next to the axes). Only matters if axes are drawn. You can make your own ticks using \tikzpkg\ inside a \scopeenv\ environment with the |background| key. For instance, you might want to label the axes as 0, $n$, $2n$, \ldots You can achieve this as follows: (you can also use |x tick handler|). +Suppress axes ticks (the numbers next to the axes). Only matters if axes are +drawn. You can make your own ticks using \tikzpkg\ inside a \scopeenv\ +environment with the |background| key. For instance, you might want to label the +axes as 0, $n$, $2n$, \ldots You can achieve this as follows: (you can also use +|x tick handler|). \begin{codeexample}[width = 5.7cm] \begin{sseqpage}[ no x ticks, x range = {0}{3} ] \begin{scope}[ background ] @@ -1961,8 +2733,10 @@ Suppress axes ticks (the numbers next to the axes). Only matters if axes are dra Sets the interval between labels. \end{keylist} -\begin{keylist}{x tick offset = \meta{integer} (initially 0),y tick offset = \meta{integer} (initially 0),tick offset = \meta{integer} (initially 0)} -Sets the label offset -- by default the ticks will always be the set of numbers that are 0 mod \meta{tick step}. Change it so that the ticks are the set of numbers that are \meta{tick offset} mod \meta{tick step}. +\begin{keylist}{x tick offset = \meta{integer} (initially 0),y tick offset = \meta{integer} (initially 0),tick offset = \meta{integer} (initially 0)}% +Sets the label offset -- by default the ticks will always be the set of numbers +that are 0 mod \meta{tick step}. Change it so that the ticks are the set of +numbers that are \meta{tick offset} mod \meta{tick step}. \end{keylist} \begin{keylist}{ @@ -1972,8 +2746,9 @@ Sets the label offset -- by default the ticks will always be the set of numbers x minor tick step = \meta{nonnegative integer} (initially 0), y minor tick step = \meta{nonnegative integer} (initially 0), minor tick step = \meta{nonnegative integer}% -} -If these are nonzero, they control the placement of tick marks on the axes. The value 0 prevents tick marks from being drawn. Uses |x tick offset| as an offset. +}% +If these are nonzero, they control the placement of tick marks on the axes. The +value 0 prevents tick marks from being drawn. Uses |x tick offset| as an offset. \begin{codeexample}[width=7cm] \begin{sseqpage}[ tick step = 5, @@ -1997,11 +2772,17 @@ Change the tick style: \end{codeexample} \end{stylekeylist} -\begin{keylist}{x tick handler = \meta{function} (initially \#1), y tick handler = \meta{function} (initially \#1), tick handler = \meta{function} (initially \#1)} +\begin{keylist}{% + x tick handler = \meta{function} (initially \#1),% + y tick handler = \meta{function} (initially \#1),% + tick handler = \meta{function} (initially \#1)% +} \declarecustomhandler{x tick handler}{\codehandler} \declarecustomhandler{y tick handler}{\codehandler} \declarecustomhandler{tick handler}{\codehandler} -The value for |x tick handler| should be a function that takes in the current $\mathtt{x}$ value and outputs the appropriate tick. Correspondingly with |y tick handler|. The |tick handler| key sets both. +The value for |x tick handler| should be a function that takes in the current +$\mathtt{x}$ value and outputs the appropriate tick. Correspondingly with% +|y tick handler|. The |tick handler| key sets both. \begin{codeexample}[width = 7cm] \begin{sseqpage}[ x range = {0}{4}, yscale = 1.78, x tick handler = { @@ -2024,8 +2805,21 @@ The value for |x tick handler| should be a function that takes in the current $\ \end{keylist} \subsection{Layout} -\begin{keylist}{x axis type = \meta{type} (initially border), y axis type = \meta{type} (initially border),axes type = \meta{type} (initially border), no x axis, no y axis, no axes} -The \meta{type} is either |border|, |center|, |frame|, or |none|. |no axes| is a shorthand for |axes type=none|. The |border| type is the default and puts the axes on the bottom and left of the picture. The |center| type by default places the axes to pass through $(0,0)$; this can be modified using the |x axis origin| and |y axis origin| keys. See \example{KRAHSS} and \example{KUHFPSS} for examples where this is used. The |frame| type draws a frame around the entire chart: +\begin{keylist}{% + x axis type = \meta{type} (initially border),% + y axis type = \meta{type} (initially border),% + axes type = \meta{type} (initially border),% + no x axis,% + no y axis,% + no axes% +}% +The \meta{type} is either |border|, |center|, |frame|, or |none|. |no axes| is a +shorthand for |axes type=none|. The |border| type is the default and puts the +axes on the bottom and left of the picture. The |center| type by default places +the axes to pass through $(0,0)$; this can be modified using the |x axis origin| +and |y axis origin| keys. See \example{KRAHSS} and \example{KUHFPSS} for +examples where this is used. The |frame| type draws a frame around the entire +chart: \begin{codeexample}[width=6cm] \begin{sseqpage}[ axes type = frame ] @@ -2036,31 +2830,50 @@ The \meta{type} is either |border|, |center|, |frame|, or |none|. |no axes| is a \end{keylist} \parskip=0pt -\begin{keylist}{x axis origin = \meta{x value} (initially 0), y axis origin = \meta{y value} (initially 0)} -If you use |axes type = center|, these keys change the position of the axes. Otherwise, they are ignored. +\begin{keylist}{% + x axis origin = \meta{x value} (initially 0),% + y axis origin = \meta{y value} (initially 0)% +}% +If you use |axes type = center|, these keys change the position of the axes. +Otherwise, they are ignored. \end{keylist} % -\begin{keylist}{x axis gap = \meta{dimension} (initially 0.5cm),y axis gap = \meta{dimension} (initially 0.5cm), axes gap = \meta{dimension} (initially 0.5cm)} +\begin{keylist}{% + x axis gap = \meta{dimension} (initially 0.5cm),% + y axis gap = \meta{dimension} (initially 0.5cm),% + axes gap = \meta{dimension} (initially 0.5cm)% +}% % \end{keylist} % -\begin{keylist}{x tick gap = \meta{dimension} (initially 0.5cm),y tick gap = \meta{dimension} (initially 0.5cm)} +\begin{keylist}{% + x tick gap = \meta{dimension} (initially 0.5cm),% + y tick gap = \meta{dimension} (initially 0.5cm)% +} % \end{keylist} % -\begin{keylist}{ - x axis extend start = \meta{dimension} (initially 0.5cm), y axis extend start = \meta{dimension} (initially 0.5cm), - x axis extend end = \meta{dimension} (initially 0.5cm), y axis extend end = \meta{dimension} (initially 0.5cm), - x axis tail = \meta{dimension} (initially 0.9cm), y axis tail = \meta{dimension} (initially 0.9cm)% +\begin{keylist}{% + x axis extend start = \meta{dimension} (initially 0.5cm),% + y axis extend start = \meta{dimension} (initially 0.5cm),% + x axis extend end = \meta{dimension} (initially 0.5cm),% + y axis extend end = \meta{dimension} (initially 0.5cm),% + x axis tail = \meta{dimension} (initially 0.9cm),% + y axis tail = \meta{dimension} (initially 0.9cm)% } \end{keylist} % -\begin{keylist}{x axis clip padding = \meta{dimension} (initially 0.1cm), y axis clip padding = \meta{dimension} (initially 0.1cm)} +\begin{keylist}{% + x axis clip padding = \meta{dimension} (initially 0.1cm),% + y axis clip padding = \meta{dimension} (initially 0.1cm)% +} \end{keylist} % -\begin{keylist}{ - right clip padding = \meta{dimension} (initially 0.1cm), left clip padding = \meta{dimension} (initially 0.1cm), - top clip padding = \meta{dimension} (initially 0.1cm), bottom clip padding = \meta{dimension} (initially 0.1cm)% +\begin{keylist}{% + right clip padding = \meta{dimension} (initially 0.1cm),% + left clip padding = \meta{dimension} (initially 0.1cm),% + top clip padding = \meta{dimension} (initially 0.1cm),% + bottom clip padding = \meta{dimension} (initially 0.1cm)% } \end{keylist} @@ -2072,16 +2885,27 @@ If you use |axes type = center|, these keys change the position of the axes. Oth \parskip=10pt -\begin{key}{custom clip = \meta{clip path}} -Give a custom clipping. The clipping specified must be in the form of a valid \tikzpkg\ path, for instance |\clip (0,0) rectangle (10,10);|. This clipping is also applied to any grid and is used to draw ellipses on appropriate differentials or structure lines that go out of bounds and to determine whether a differential or structure line is an ``orphan''. It is not applied to any background elements, which is important because these are often used for axes labels and such that should lie outside of the clipping region. Weird things can happen with out of range edges if you provide an oddly shaped path. +\begin{key}{custom clip = \meta{clip path}}% +Give a custom clipping. The clipping specified must be in the form of a valid +\tikzpkg\ path, for instance |\clip (0,0) rectangle (10,10);|. This clipping is +also applied to any grid and is used to draw ellipses on appropriate +differentials or structure lines that go out of bounds and to determine whether +a differential or structure line is an ``orphan''. It is not applied to any +background elements, which is important because these are often used for axes +labels and such that should lie outside of the clipping region. Weird things can +happen with out of range edges if you provide an oddly shaped path. \end{key} -\begin{key}{clip = \meta{boolean} (default true)(initially true)} -If this is false the spectral sequence chart won't be clipped. I'm not really sure why you would want that, but there might be some use case. Setting this to be false is not fully supported, and it's possible that weird things will happen with some of the edges that go out of range. +\begin{key}{clip = \meta{boolean} (default true)(initially true)}% +If this is false the spectral sequence chart won't be clipped. I'm not really +sure why you would want that, but there might be some use case. Setting this to +be false is not fully supported, and it's possible that weird things will happen +with some of the edges that go out of range. \end{key} -\begin{key}{rotate labels = \meta{boolean} (default true)(initially false)} -If you use |rotate = 90| but also want the labels rotated (so that the whole chart is sideways) use this key. +\begin{key}{rotate labels = \meta{boolean} (default true)(initially false)}% +If you use |rotate = 90| but also want the labels rotated (so that the whole +chart is sideways) use this key. \end{key} \end{document} diff --git a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanualpreamble.tex b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanualpreamble.tex index b9e76710c8..e38aeb3994 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanualpreamble.tex +++ b/graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanualpreamble.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: spectralsequencesmanualpreamble.tex diff --git a/graphics/pgf/contrib/spectralsequences/manual/sseqmanualtest.tex b/graphics/pgf/contrib/spectralsequences/manual/sseqmanualtest.tex deleted file mode 100755 index e69de29bb2..0000000000 --- a/graphics/pgf/contrib/spectralsequences/manual/sseqmanualtest.tex +++ /dev/null diff --git a/graphics/pgf/contrib/spectralsequences/spectralsequences.sty b/graphics/pgf/contrib/spectralsequences/src/spectralsequences.sty index 10268984bd..e66aa5c780 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/spectralsequences.sty +++ b/graphics/pgf/contrib/spectralsequences/src/spectralsequences.sty @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% A package for drawing spectral sequences @@ -23,7 +23,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{spectralsequences}[2019/02/18 v1.2.2] +\ProvidesPackage{spectralsequences}[2021/07/18 v1.3.0] \RequirePackage{tikz} \RequirePackage{etoolbox} @@ -63,7 +63,8 @@ \quiet\endquiet % These are defined in sseqmain: \class\classoptions\replaceclass\replacesource\replacetarget - \d\doptions\kill\structline\structlineoptions\circleclasses + \replacestructlines + \d\doptions\kill\structline\structlineoptions\extension\extensionoptions\circleclasses \lastlabel % The following are defined in sseqparsers: \pgfmathparse\isalive\lastx\lasty\lastclass\savestack\restorestack\pushstack\nameclass\tagclass @@ -108,6 +109,9 @@ \newif\ifsseq@drawedge \newif\ifsseq@tikzprims@integershift \newif\ifsseq@anchor +\newif\ifsseq@rangecheck +\newif\ifsseq@rangecheck@sideways + \sseq@drawedgetrue \sseq@tikzprims@integershifttrue @@ -241,12 +245,13 @@ \let\sseq@breakpoint\relax \let\sseq@breakpointfinally\@gobble -\def\sseq@break#1\sseq@breakpoint{} -\def\sseq@break@finally#1\sseq@breakpoint#2{#2} +\long\def\sseq@break#1\sseq@breakpoint{} +\def\sseq@fbreak{\@xp\sseq@break\romannumeral-`0} +\long\def\sseq@break@finally#1\sseq@breakpoint#2{#2} -\def\sseq@breakfi{\fi\sseq@break} -\def\sseq@breakfifi{\fi\fi\sseq@break} -\def\sseq@breakfififi{\fi\fi\fi\sseq@break} +\long\def\sseq@breakfi{\fi\sseq@break} +\long\def\sseq@breakfifi{\fi\fi\sseq@break} +\long\def\sseq@breakfififi{\fi\fi\fi\sseq@break} \long\def\sseq@breakdataenv#1\end#2{ \def\sseq@tempa{sseqdata}\def\sseq@tempb{#2}\ifx\sseqtempa\sseqtempb \@xp\sseq@breakdataenv@ @@ -274,7 +279,7 @@ \let\sseqnewgroup\@gobblethree } - +\AtBeginEnvironment{sideways}{\sseqset{range check sideways}} \input sseqmessages.code.tex % Exposes directly: \sseqerrortowarning \input sseqcheckdefinitions.code.tex @@ -309,6 +314,7 @@ \let\sseq@class@object\sseq@class@draw@ifpage \let\sseq@differential@object\sseq@differential@draw@ifpage \let\sseq@structline@object\sseq@structline@draw@ifpage +\let\sseq@extension@object\sseq@extension@draw@ifpage \let\sseq@circleclass@object\sseq@circleclass@draw@ifpage \let\sseq@tikzpath@object\@firstofone diff --git a/graphics/pgf/contrib/spectralsequences/sseqcheckdefinitions.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqcheckdefinitions.code.tex index 5cd92a3bf3..ad4570d5fa 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqcheckdefinitions.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqcheckdefinitions.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqcheckdefinitions.code.tex @@ -28,29 +28,33 @@ %% \ExplSyntaxOn -% I should work out how old the version of xparse has to be before this breaks, but I'm too lazy. -% It would also be nice if I could figure out how to ensure that my trick of setting \l__xparse_grab_expandably_bool to false works correctly, but this might be difficult +% I should work out how old the version of xparse has to be before this breaks, +% but I'm too lazy. It would also be nice if I could figure out how to ensure +% that my trick of setting \l__cmd_grab_expandably_bool to false works +% correctly, but this might be difficult \@ifpackagelater{xparse}{2017/02/08}{ - \sseq@checkprotecteddef \__xparse_grab_u:w #1#2 \__xparse_run_code:{ - \__xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn + \cs_if_exist:NTF \__xparse_grab_u:w { + \global\sseq@patchxparseUtrue + }{ + \sseq@checkprotecteddef \__cmd_grab_u:w #1#2 \__cmd_run_code:{ + \__cmd_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn } - \sseq@checkprotecteddef\__xparse_grab_u_aux:nnN #1#2#3 - { - \tl_set:Nn \l__xparse_signature_tl {#2} - \exp_after:wN #3 \l__xparse_fn_tl ##1 #1 - { \__xparse_add_arg:n {##1} } - \l__xparse_fn_tl + \sseq@checkprotecteddef\__cmd_grab_u_aux:nnN #1#2#3 { + \tl_set:Nn \l__cmd_signature_tl {#2} + \exp_after:wN #3 \l__cmd_fn_tl ##1 #1 + { \__cmd_add_arg:n {##1} } + \l__cmd_fn_tl } - \sseq@checkprotecteddef \__xparse_normalize_type_u:w #1 { - \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn } - \__xparse_normalize_check_lu:N u - \__xparse_add_arg_spec_mandatory:n { u {#1} } % Oct 17, 2018 -% \int_incr:N \l__xparse_mandatory_args_int -% \tl_clear:N \l__xparse_last_delimiters_tl - \__xparse_normalize_arg_spec_loop:n + \sseq@checkprotecteddef \__cmd_normalize_type_u:w #1 { + \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_check_lu:N u + \__cmd_add_arg_spec_mandatory:n { u {#1} } % Oct 17, 2018 +% \int_incr:N \l__cmd_mandatory_args_int +% \tl_clear:N \l__cmd_last_delimiters_tl + \__cmd_normalize_arg_spec_loop:n } \ifsseq@tempif @@ -59,6 +63,7 @@ \global\sseq@patchxparseUfalse \fi \sseq@tempiftrue + } }{} \@ifpackagelater{expl3}{2018/10/01}{ @@ -100,6 +105,7 @@ \sseq@tempiffalse % We'll throw a critical error in spectralsequences.sty to end input \endinput \fi +\sseq@tempiftrue %% %% sseqdrawing.code.tex %% @@ -126,8 +132,21 @@ \ifsseq@tempif \global\sseq@patchfittrue \else - \sseq@warning{fit-patch-failed} - \global\sseq@patchfitfalse + % New version of \tikz@calc@anchor + \sseq@tempiftrue + \sseq@checkdef\tikz@calc@anchor#1.#2\tikz@stop{% + \ifcsname pgf@sh@ns@\tikz@pp@name {#1}\endcsname + \pgfpointanchor {\tikz@pp@name {#1}}{#2}% + \else + \pgfpointanchor {#1}{#2}% + \fi + } + \ifsseq@tempif + \global\sseq@patchfittrue + \else + \sseq@warning{fit-patch-failed} + \global\sseq@patchfitfalse + \fi \fi \sseq@tempiftrue diff --git a/graphics/pgf/contrib/spectralsequences/sseqdrawing.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqdrawing.code.tex index 3f3060dc7f..db01b04481 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqdrawing.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqdrawing.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqdrawing.code.tex @@ -38,20 +38,33 @@ \sseq@setlayoutparameter{bottomclippadding}{x\sseq@xaxistype} \sseq@setlayoutparameter{topclippadding}{x\sseq@xaxistype} \sseq@setlayoutparameter{xlabelposition}{x\sseq@xaxistype} + \sseq@setlayoutparameter{totalverticalmargin}{x\sseq@xaxistype} % \sseq@setlayoutparameter{xaxisorigin}{y\sseq@yaxistype} - \sseq@setlayoutparameter{drawxaxis}{y\sseq@xaxistype} + \sseq@setlayoutparameter{drawxaxis}{y\sseq@yaxistype} \sseq@setlayoutparameter{xaxisstartoffset}{y\sseq@yaxistype} \sseq@setlayoutparameter{xaxisendoffset}{y\sseq@yaxistype} \sseq@setlayoutparameter{leftgridpadding}{y\sseq@yaxistype} \sseq@setlayoutparameter{rightgridpadding}{y\sseq@yaxistype} \sseq@setlayoutparameter{leftclippadding}{y\sseq@yaxistype} \sseq@setlayoutparameter{rightclippadding}{y\sseq@yaxistype} - \sseq@setlayoutparameter{ylabelposition}{y\sseq@xaxistype} + \sseq@setlayoutparameter{ylabelposition}{y\sseq@yaxistype} + \sseq@setlayoutparameter{totalhorizontalmargin}{y\sseq@yaxistype} } % The appropriate one of these is chosen by the "axis type" keys in sseqkeys. +% Used to calculate available area in range check +\def\sseq@totalhorizontalmargin@yborder{(\sseq@xaxis@tail + \sseq@yaxisgap + \sseq@xaxis@end@extend + \sseq@clip@padding@right)} +\def\sseq@totalhorizontalmargin@yframe{(\sseq@ylabelgap + \sseq@maxylabelwidth + \sseq@yaxisgap * 2)} +\def\sseq@totalhorizontalmargin@ycenter{(\sseq@xaxis@start@extend + \sseq@clip@padding@left + \sseq@xaxis@end@extend + \sseq@clip@padding@right)} +\def\sseq@totalhorizontalmargin@ynone{(\sseq@xaxis@start@extend + \sseq@clip@padding@left + \sseq@xaxis@end@extend + \sseq@clip@padding@right)} + +\def\sseq@totalverticalmargin@xborder{(\sseq@yaxis@tail + \sseq@xaxisgap + \sseq@yaxis@end@extend + \sseq@clip@padding@top)} +\def\sseq@totalverticalmargin@xframe{(\sseq@xlabelgap + \sseq@xlabelheight + \sseq@xaxisgap * 2)} +\def\sseq@totalverticalmargin@xcenter{(\sseq@yaxis@start@extend + \sseq@clip@padding@bottom + \sseq@yaxis@end@extend + \sseq@clip@padding@top)} +\def\sseq@totalverticalmargin@xnone{(\sseq@yaxis@start@extend + \sseq@clip@padding@bottom + \sseq@yaxis@end@extend + \sseq@clip@padding@top)} + % Used to determine axis and ticks placement \def\sseq@xaxisorigin@yborder{\sseq@xmin} \def\sseq@xaxisorigin@yframe{\sseq@xmin} @@ -77,7 +90,7 @@ \def\sseq@topgridpadding@xcenter{\sseq@yaxis@end@extend} \def\sseq@bottomgridpadding@xframe{\dimexpr\sseq@xaxisgap-\sseq@xclip@axisgap\relax} \def\sseq@topgridpadding@xframe{5cm} -\def\sseq@bottomgridpadding@xnone{\sseqxaxisgap} +\def\sseq@bottomgridpadding@xnone{\sseq@xaxisgap} \def\sseq@topgridpadding@xnone{\sseq@xaxisgap} \def\sseq@leftclippadding@yborder{\dimexpr-\sseq@yaxisgap+\sseq@yclip@axisgap\relax} @@ -369,21 +382,13 @@ \def\sseq@grid@chess{ \bgroup \pgfscope - % Pad on the right and top by either the grid padding, or the remaining piece of the checkerboard before it would start a new square - % (it looks ugly to have a tiny sliver). Annoyingly, mod returns its result with the same sign as its input, so in order to reduce mod - % \sseq@xgridstep and get a positive result, we have to do it twice. The 0.5cm*scale here matches the -0.5 in the \pgfpathgrid call. - \pgfmathsetmacro\sseq@rightpadding{min( - \sseq@rightgridpadding, - 1cm* mod(mod(-\sseq@xmax,\sseq@xgridstep)+\sseq@xgridstep,\sseq@xgridstep)+0.5cm*\sseq@xscale-0.05cm - )} - \pgfmathsetmacro\sseq@toppadding{min( - \sseq@topgridpadding, - 1cm * mod(mod(-\sseq@ymax,\sseq@ygridstep)+\sseq@ygridstep,\sseq@ygridstep)+0.5cm*\sseq@yscale-0.02cm - )} % Because of complicated aliasing issues that arise when misusing the \pgfgrid command in this way, % it's more convenient to add a clip than to actually stop things in the right place. - \clip (\sseq@xmin-\sseq@xoffset,\sseq@ymin-\sseq@yoffset) ++ (-0.48, -0.48) - rectangle ([shift={(\sseq@rightpadding pt,\sseq@toppadding pt)}]\sseq@xmax,\sseq@ymax); + \clip (\sseq@xmin-0.49,\sseq@ymin-0.49) + rectangle (\sseq@xmax+0.49,\sseq@ymax+0.49); +% \clip (\sseq@xmin,\sseq@ymin) ++ (-0.49, -0.49) +% rectangle ([shift={(0.5cm*\sseq@yscale,0.5*\sseq@xscale)}] +% \sseq@xmax,\sseq@ymax); % \sseq@useclip \pgfsetcolor{\sseq@gridcolor} @@ -433,14 +438,16 @@ \pgfsetdash{{1cm*\sseq@stepscale}{1cm*\sseq@stepscale}}{1cm*\sseq@stepscale} % % Naturally some trial and error occurred here too. - % Note the huge multiples of \sseq@xgridstep I added in -- they probably aren't necessary, but I don't understand what's going on so whatever. + % Note the huge multiples of \sseq@xgridstep I added in -- they probably aren't necessary, but I don't understand what's going on so whatever. They make sure that the pattern always extends past the edge of the clipping region. Otherwise the gird occasionally stops short for some reason. % The basic idea is that things need to be divisible by twice the grid step. The part I added in the shift above % was the remainder when you divide \sseq@xmin by twice the grid step, now we need to add in the multiple of twice the grid step. % The -0.5 is ensuring that the checkerboard boundaries lie at half-integer coordinates (I think). \pgfpathgrid[stepx= 2cm*\sseq@stepscale,stepy=2cm*\sseq@stepscale] { \pgfpointxy - { -0.5 + \sseq@intdivfloor{\numexpr\sseq@xmin - \sseq@xgridstep\relax}{2*\sseq@xgridstep}*2*\sseq@xgridstep + \sseq@xoffset - 50*\sseq@xgridstep } - { -0.5 + \sseq@intdivfloor{\numexpr\sseq@ymin - \sseq@ygridstep\relax}{2*\sseq@ygridstep}*2*\sseq@ygridstep + \sseq@yoffset - 50*\sseq@ygridstep} + { -0.5 + \sseq@intdivfloor{\numexpr\sseq@xmin - \sseq@xgridstep\relax}{2*\sseq@xgridstep}*2*\sseq@xgridstep + \sseq@xoffset -50*\sseq@xgridstep + } + { -0.5 + \sseq@intdivfloor{\numexpr\sseq@ymin - \sseq@ygridstep\relax}{2*\sseq@ygridstep}*2*\sseq@ygridstep + \sseq@yoffset -50*\sseq@ygridstep + } }{ \pgfpointxy { \sseq@xmax + \sseq@xoffset + 50*\sseq@xgridstep } { \sseq@ymax + \sseq@yoffset + 50*\sseq@ygridstep } @@ -531,7 +538,7 @@ %%% Draw Classes %%% %%% Class offsets -\sseqnewclasspattern{standard}{ +\SseqNewClassPattern{standard}{ (0,0); (-0.13,0)(0.13,0); (-0.2,0)(0,0)(0.2,0); @@ -945,7 +952,11 @@ \def\pgfkeysdefaultpath{/sseqpages/#3/}% \sseq@options@bothpassmode \sseq@thesseqstyle - \sseq@theedgestyle\csname sseq@the#3style\endcsname\the\sseq@scope@toks + \sseq@theedgestyle\csname sseq@the#3style\endcsname + \ifsseq@thispage + \csname sseq@thethispage#3style\endcsname + \fi + \the\sseq@scope@toks #4% \csname sseq@collections@#3@hook\endcsname \pgftransformshift{\pgfqpointxy{-\the\sseq@x}{-\the\sseq@y}}% @@ -989,9 +1000,16 @@ \fi \fi \ifsseq@needstikz - \draw[/sseqpages, - /utils/exec={\sseq@thesseqstyle\sseq@theedgestyle\csname sseq@the#3style\endcsname\the\sseq@scope@toks - \temparrowstartspec\temparrowendspec #4}% + \draw[/sseqpages,% + /utils/exec={% + \sseq@thesseqstyle\sseq@theedgestyle + \csname sseq@the#3style\endcsname + \ifsseq@thispage + \csname sseq@thethispage#3style\endcsname + \fi + \the\sseq@scope@toks + \temparrowstartspec\temparrowendspec #4% + }% ] (tempa) to (tempb);% \else \temparrowstartspec @@ -1126,12 +1144,33 @@ \tikz@lib@fit@scan% } +%\def\tikz@calc@anchor#1.#2\tikz@stop{% +% \ifcsname pgf@sh@ns@\tikz@pp@name {#1}\endcsname +% \pgfpointanchor {\tikz@pp@name {#1}}{#2}% +% \else +% \pgfpointanchor {#1}{#2}% +% \fi +%} +%l.8 \show\tikz@calc@anchor + % This is copied with modification from \pgf\frontendlayer\tikz\tikz.code.tex line 5164 \def\sseq@fit@tikz@calc@anchor#1.#2\tikz@stop{% - \pgfutil@ifundefined{pgf@sh@ns@#1}{\sseq@tempiffalse}{%If the node doesn't exist, don't throw an error but record that we should skip it - \pgfpointanchor{\tikz@pp@name{#1}}{#2}% - }%s + \ifcsname pgf@sh@ns@\tikz@pp@name {#1}\endcsname + \pgfpointanchor {\tikz@pp@name {#1}}{#2}% + \else + \ifcsname pgf@sh@ns@#1\endcsname + \pgfpointanchor {#1}{#2}% + \else + \sseq@tempiffalse + \fi + \fi } +%\def\sseq@fit@tikz@calc@anchor#1.#2\tikz@stop{% +% \pgfutil@ifundefined{pgf@sh@ns@#1}{\sseq@tempiffalse}{%If the node doesn't exist, don't throw an error but record that we should skip it +% \pgfpointanchor{\tikz@pp@name{#1}}{#2}% +% }%s +%} + %% @@ -1148,15 +1187,28 @@ \let\tikz@grid\sseq@tikz@grid \let\tikz@scan@handle@options\sseq@tikz@scan@handle@options \let\tikz@@@parse@polar\sseq@tikz@@@parse@polar + \let\tikz@scan@relative\sseq@tikz@scan@relative } +\newif\ifsseq@draw@addoffset % control whether to offset coordinates by (\sseq@xoffset,\sseq@yoffset). +\sseq@draw@addoffsettrue % Some of the stuff in tikzlibrarycalc will probably be broken, hopefully not too much \let\sseq@tikz@scan@one@point@noshift\tikz@scan@one@point \let\sseq@tikz@@@parse@regular@save\tikz@@@parse@regular +\def\sseq@tikz@scan@relative#1+{% + \global\sseq@draw@addoffsetfalse + %\global\let\tikz@@@parse@regular\sseq@tikz@@@parse@regular@save + \pgfutil@ifnextchar+{% + \tikz@scan@plusplus{\global\sseq@draw@addoffsettrue#1}% + }{% + \tikz@scan@oneplus{\global\sseq@draw@addoffsettrue#1}% + }% +} + \def\sseq@tikz@scan@one@point@noshift@active#1{% - \let\tikz@@@parse@regular\sseq@tikz@@@parse@regular@save - \def\sseq@scanonepoint@cmd{\let\tikz@@@parse@regular\sseq@tikz@@@parse@regular#1} + \global\sseq@draw@addoffsetfalse + \def\sseq@scanonepoint@cmd{\global\sseq@draw@addoffsettrue#1} \tikz@scan@one@point\sseq@scanonepoint@cmd% } @@ -1167,8 +1219,9 @@ \def\sseq@tikz@to@curve@path{% [every curve to] \pgfextra{ + %\sseq@draw@addoffsetfalse \let\tikz@@@parse@regular\sseq@tikz@@@parse@regular@save % I added this to prevent repeated offsets from screwing us up - %\let\sseq@tikz@scan@one@point@noshift\tikz@scan@one@point + \let\sseq@tikz@scan@one@point@noshift\tikz@scan@one@point \iftikz@to@relative\tikz@to@compute@relative\else\tikz@to@compute\fi } \tikz@computed@path @@ -1197,24 +1250,25 @@ \def\sseq@tikz@@@parse@regular#1#2#3){% \pgfutil@in@,{#3}% \ifpgfutil@in@% - \tikz@parse@splitxyz{#1}{#2}#3,% + \tikz@parse@splitxyz{#1}{#2}#3,% Perhaps put an error here? We probably don't handle 3d coords correctly. \else% \tikz@checkunit{#2}% \iftikz@isdimension% - \tikz@checkunit{#3}% - \iftikz@isdimension% - \def\@next{#1{\pgfpointxy{(#2)/1cm+\sseq@xoffset}{(#3)/1cm+\sseq@yoffset}}}% - \else% - \def\@next{#1{\pgfpointxy{(#2)/1cm+\sseq@xoffset}{#3+\sseq@yoffset}}}% - \fi% - \else% - \tikz@checkunit{#3}% - \iftikz@isdimension% - \def\@next{#1{\pgfpointxy{#2+\sseq@xoffset}{(#3)/1cm+\sseq@yoffset}}}% - \else% - \def\@next{#1{\pgfpointxy{#2+\sseq@xoffset}{#3+\sseq@yoffset}}}% - \fi% - \fi% + \def\temp@xcoord{(#2)/1cm}% + \else + \def\temp@xcoord{#2}% + \fi + \tikz@checkunit{#3}% + \iftikz@isdimension + \def\temp@ycoord{(#3)/1cm}% + \else + \def\temp@ycoord{#3}% + \fi + \ifsseq@draw@addoffset + \edef\temp@xcoord{\unexpanded\@xp{\temp@xcoord}+\unexpanded\@xp{\sseq@xoffset}}% + \edef\temp@ycoord{\unexpanded\@xp{\temp@ycoord}+\unexpanded\@xp{\sseq@yoffset}}% + \fi + \edef\@next{\unexpanded{#1}{\@nx\pgfpointxy{\unexpanded\@xp{\temp@xcoord}}{\unexpanded\@xp{\temp@ycoord}}}}% \fi% \@next% } diff --git a/graphics/pgf/contrib/spectralsequences/sseqforeach.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqforeach.code.tex index 7b72f6eb19..ff849acd25 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqforeach.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqforeach.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqforeach.code.tex @@ -66,7 +66,7 @@ } \def\sseq@DoUntilOutOfBounds@ #1 { - \sseq@esetthiscall{\string\DoUntilOutOfBoundsThenNMore} + \sseq@esetthiscall{\string\DoUntilOutOfBounds} \sseq@opushstacktrace{\string\DoUntilOutOfBounds} \ifx\sseq@xminmax\@gobbletwo\else\ifx\sseq@yminmax\@gobbletwo\else \sseq@error@x{DoUntil-no-bound}{\string\DoUntilOutOfBounds} diff --git a/graphics/pgf/contrib/spectralsequences/sseqkeys.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqkeys.code.tex index 1581a516ec..03c8c7591a 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqkeys.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqkeys.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqkeys.code.tex @@ -595,8 +595,8 @@ \pgfkeysalso{/sseqpages/alias/.expand once=\detokenize\@xp{\sseq@class@name}}% }, show name/.store in=\sseq@class@showname, - page/.code={\sseq@getnumrange\sseq@class@page{#1}},% page & gen are only for \classoptions. - generation/.code={\sseq@getnumrange\sseq@gen{#1}}, % \class tests if \sseq@class@page is set and throw an error if so. + page/.code={\sseq@getnumrange@defaultupperboundinfty\sseq@class@page{#1}},% page & gen are only for \classoptions. + generation/.code={\sseq@getnumrange@defaultupperboundinfty\sseq@gen{#1}}, % \class tests if \sseq@class@page is set and throw an error if so. tag/.code={\sseq@d@addto@macro\sseq@class@tag{#1}}, offset/.store in=\sseq@tempoffset, tooltip/.sseq @ first pass code={\ifx\sseqtooltip\undefined \sseq@error{no-tooltip}\else \def\sseq@tooltip{#1}\fi}, @@ -604,23 +604,46 @@ } \pgfqkeys{/sseqpages/struct line}{ - page/.code={\sseq@getnumrange\sseq@structline@page{#1}} + page/.code={\sseq@getnumrange@defaultupperboundinfty\sseq@structline@page{#1}} } \def\sseq@fitalso{} \pgfqkeys{/sseqpages/fit}{ fit/.sseq @ first pass code={\sseq@d@addto@macro\sseq@fitalso{#1}}, - page/.code={\sseq@getnumrange\sseq@fit@page{#1}} + page/.code={\sseq@getnumrange@defaultupperboundinfty\sseq@fit@page{#1}} } -\def\sseq@getnumrange#1#2{ +\def\sseq@getnumrange#1#2{% + \pgfutil@in@{--}{#2}\ifpgfutil@in@ + \sseq@getnumrange@range#1#2\sseq@nil + \else + \sseq@getnumrange@range#1#2--#2\sseq@nil + \fi +} + +\def\sseq@getnumrange@defaultupperboundinfty#1#2{% \pgfutil@in@{--}{#2}\ifpgfutil@in@ \sseq@getnumrange@range#1#2\sseq@nil \else \sseq@getnumrange@range#1#2--\sseq@infinity\sseq@nil \fi } -\def\sseq@getnumrange@range#1#2--#3\sseq@nil{\edef#1{\the\numexpr#2}\@xp\edef\csname\sseq@macroname#1max\endcsname{\the\numexpr#3}} + +\def\sseq@getnumrange@range#1#2--#3\sseq@nil{% + \ifx\infty#2 + \edef#1{\sseq@infinity}% + \@xp\edef\csname\sseq@macroname#1max\endcsname{\sseq@infinity}% + \else + \edef#1{\the\numexpr#2}% + \ifx\infty#3 + \@xp\edef\csname\sseq@macroname#1max\endcsname{\sseq@infinity}% + \else + \@xp\edef\csname\sseq@macroname#1max\endcsname{\the\numexpr#3}% + \fi + \fi +} + + %% Needs tikz % Force \class or \d to fall back to using tikz to render their output @@ -1116,7 +1139,6 @@ \sseq@temp@ii/.code/.expanded={% \unexpanded{#3{##1}}{\sseq@temp=\unexpanded{##1}}% \unexpanded{\edef#1{\unexpanded\@xp{\sseq@sanitize@output}}}% - %\show\@nx#1 \sseq@breakpoint }, \sseq@temp@ii/.value required, @@ -1380,6 +1402,15 @@ update existing/.sseq default code={\sseq@updateexistingtrue} } +\def\sseq@printnum@inftytosymbol#1{% + \ifnum#1=\sseq@infinity\relax + $\infty$% + \else + #1% + \fi +} + + \sseq@addtostorelist\sseq@grid{\relax} \sseq@addiftostorelist{hasdegree} \let\sseq@maybemathswitch\relax @@ -1388,18 +1419,28 @@ name/.sseq default error, ~page/.code={ \ifsseq@hasname - \sseq@getnumrange\sseq@thepage{#1} + \sseq@getnumrange\sseq@thepage{#1}% \sseq@thepagecount=\sseq@thepage\relax \let\page\sseq@thepage + \ifnum\sseq@thepage=\sseq@infinity + \def\page{$\infty$}% + \fi + \def\sseq@temp{\sseq@novalue} + \ifx\sseq@printpageas\sseq@temp + \def\sseq@printpageas{Page \page} + \ifnum\sseq@thepage<\sseq@thepagemax + \ifnum\sseq@thepagemax=\sseq@infinity\relax + \def\sseq@printpageas{Page \page\space(all differentials)} + \else + \def\sseq@printpageas{Page \page\space(differentials of length $\leq\sseq@thepagemax$)} + \fi + \fi + \fi \edef\sseq@thepagemm{\the\numexpr\sseq@thepagecount-1\relax} - \ifx\sseq@thepagemax\sseq@infinity - \edef\sseq@thepagemaxpp{\the\numexpr\sseq@thepagecount+1\relax} + \ifnum\sseq@thepagemax=\z@ + \let\sseq@thepagemaxpp\sseq@infinity \else - \ifnum\sseq@thepagemax=\z@ - \let\sseq@thepagemaxpp\sseq@infinity - \else - \edef\sseq@thepagemaxpp{\the\numexpr\sseq@thepagemax+1\relax} - \fi + \edef\sseq@thepagemaxpp{\the\numexpr\sseq@thepagemax+1\relax} \fi \else \sseq@error{page-no-name} @@ -1465,6 +1506,21 @@ add class placement transform/.value required, } + +\sseq@addiftostorelist@truedefault{rangecheck} +\sseq@addiftostorelist{rangecheck@sideways} +\sseq@globalkeys{% + range check standard/.code={\sseq@rangechecktrue\sseq@rangecheck@sidewaysfalse}, + range check standard/.sseq default code={% + \def\sseq@rangecheck@default{\global\sseq@rangechecktrue}% + \def\sseq@rangecheck@sideways@default{\global\sseq@rangecheck@sidewaysfalse}% + }, + range check sideways/.code=rangecheck@sideways, + range check sideways/.sseq default code={\def\sseq@rangecheck@sideways@default{\global\sseq@rangecheck@sidewaystrue}}, + range check off/.code={\sseq@rangecheckfalse}, + range check off/.sseq default code={\def\sseq@rangecheck@default{\global\sseq@rangecheckfalse}}, +} + \sseq@mathnodestrue \sseq@addtostorelist\sseq@targetx{}\sseq@addtostorelist\sseq@targety{} @@ -1600,10 +1656,12 @@ \sseq@addtostorelist{\sseq@xtickfn}{} % These should initially be the identity macro, but addtostorelist doesn't accept functions as default \sseq@addtostorelist{\sseq@ytickfn}{} % so the default is instated in begin{sseqdata} / begin{sseqpicture}. +\let\sseq@printpageas\relax \sseq@globalkeys{% title/.sseq store in=\sseq@title{}, title style/.sseq append to style={/sseqpages/global/every title}{at={(0.5*\xmin+0.5*\xmax,\ymax)}}, draw title/.sseq is if=drawtitle, + print page as/.sseq store in=\sseq@printpageas{\sseq@novalue}, no title/.code=\sseq@drawtitlefalse, % x label/.sseq store in=\sseq@xaxislabel{}, @@ -2052,7 +2110,7 @@ page constraint or/.code={ \sseq@updatepageconstraint{#1}{||} }, - page/.code={\sseq@getnumrange\temp{#1}\sseq@updatepageconstraintrange}, + page/.code={\sseq@getnumrange@defaultupperboundinfty\temp{#1}\sseq@updatepageconstraintrange}, set page constraint/.store in=\sseq@pageconstraint, background/.code={\sseq@standardparse\sseq@setsavedpaths{background}\pgfkeysalso{standard parse}}, } diff --git a/graphics/pgf/contrib/spectralsequences/sseqloadstore.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqloadstore.code.tex index 79bd2c0cfc..19a466112b 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqloadstore.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqloadstore.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqloadstore.code.tex @@ -129,6 +129,7 @@ \def\sseq@tempsavedpaths{} \def\sseq@savedpaths@addclass@standard#1{\sseq@x@addto@macro\sseq@savedpaths{\@nx\sseq@class@object{#1}}} \def\sseq@savedpaths@adddifferential@standard#1{\sseq@x@addto@macro\sseq@savedpaths{\@nx\sseq@differential@object{#1}}} +\def\sseq@savedpaths@addextension@standard#1{\sseq@x@addto@macro\sseq@savedpaths{\@nx\sseq@extension@object{#1}}} \def\sseq@savedpaths@addstructline@standard#1{\sseq@x@addto@macro\sseq@savedpaths{\@nx\sseq@structline@object{#1}}} \def\sseq@savedpaths@xaddtikzpath@standard#1{\sseq@x@addto@macro\sseq@savedpaths{\@nx\sseq@tikzpath@object{#1}}} \def\sseq@savedpaths@add@standard{\sseq@g@addto@macro\sseq@savedpaths} @@ -138,6 +139,7 @@ \def\sseq@savedpaths@addclass@temporary#1{\sseq@x@addto@macro\sseq@tempsavedpaths{\@nx\sseq@class@draw@ifpage{#1}}} \def\sseq@savedpaths@adddifferential@temporary#1{\sseq@x@addto@macro\sseq@tempsavedpaths{\@nx\sseq@differential@draw@ifpage{#1}}} +\def\sseq@savedpaths@addextension@temporary#1{\sseq@x@addto@macro\sseq@tempsavedpaths{\@nx\sseq@extension@draw@ifpage{#1}}} \def\sseq@savedpaths@addstructline@temporary#1{\sseq@x@addto@macro\sseq@tempsavedpaths{\@nx\sseq@structline@draw@ifpage{#1}}} \def\sseq@savedpaths@xaddtikzpath@temporary#1{\sseq@x@addto@macro\sseq@tempsavedpaths{#1}} \def\sseq@savedpaths@add@temporary{\sseq@g@addto@macro\sseq@tempsavedpaths} @@ -149,6 +151,7 @@ \def\sseq@savedpaths@addclass@background#1{\sseq@error@internal@n{illegal-add-background-mode}{\sseq@savedpaths@addclass}} \def\sseq@savedpaths@adddifferential@background#1{\sseq@error@internal@n{illegal-add-background-mode}{\sseq@savedpaths@adddifferential}} \def\sseq@savedpaths@addstructline@background#1{\sseq@error@internal@n{illegal-add-background-mode}{\sseq@savedpaths@addstructline}} +\def\sseq@savedpaths@addextension@background#1{\sseq@error@internal@n{illegal-add-background-mode}{\sseq@savedpaths@addextension}} \def\sseq@savedpaths@xaddtikzpath@background#1{\sseq@x@addto@macro\sseq@savedbackgroundpaths{#1}} \def\sseq@savedpaths@add@background{\sseq@g@addto@macro\sseq@savedbackgroundpaths} \def\sseq@savedpaths@xadd@background{\sseq@x@addto@macro\sseq@savedbackgroundpaths} @@ -157,6 +160,7 @@ \def\sseq@savedpaths@addclass@ignore#1{} \def\sseq@savedpaths@adddifferential@ignore#1{} \def\sseq@savedpaths@addstructline@ignore#1{} +\def\sseq@savedpaths@addextension@ignore#1{} \def\sseq@savedpaths@xaddtikzpath@ignore#1{} \def\sseq@savedpaths@add@ignore#1{} \def\sseq@savedpaths@xadd@ignore#1{} @@ -167,6 +171,7 @@ \@xp\let\@xp\sseq@savedpaths@addclass \csname sseq@savedpaths@addclass@#1\endcsname \@xp\let\@xp\sseq@savedpaths@adddifferential\csname sseq@savedpaths@adddifferential@#1\endcsname \@xp\let\@xp\sseq@savedpaths@addstructline \csname sseq@savedpaths@addstructline@#1\endcsname + \@xp\let\@xp\sseq@savedpaths@addextension \csname sseq@savedpaths@addextension@#1\endcsname \@xp\let\@xp\sseq@savedpaths@xaddtikzpath \csname sseq@savedpaths@xaddtikzpath@#1\endcsname \@xp\let\@xp\sseq@savedpaths@add \csname sseq@savedpaths@add@#1\endcsname \@xp\let\@xp\sseq@savedpaths@xadd \csname sseq@savedpaths@xadd@#1\endcsname diff --git a/graphics/pgf/contrib/spectralsequences/sseqmacromakers.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqmacromakers.code.tex index b83e34abb7..b3449eda42 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqmacromakers.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqmacromakers.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqmacromakers.code.tex @@ -40,6 +40,9 @@ { \__xparse_add_arg:n {##1} #1 } \l__xparse_fn_tl } + \ifx\__xparse_add_grabber_mandatory:N\undefined + \let \__xparse_add_grabber_mandatory:N \__xparse_add_grabber:N + \fi \cs_new_protected:Npn \sseq__xparse_add_type_U:w #1 { \__xparse_flush_m_args: @@ -48,19 +51,38 @@ \tl_put_right:Nn \l__xparse_signature_tl { {#1} } \__xparse_prepare_signature:N } +% +% + \cs_new_protected:Npn \sseq__cmd_grab_U:w #1#2 \__cmd_run_code: + { \sseq__cmd_grab_U_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn } + \cs_new_protected:Npn \sseq__cmd_grab_U_aux:nnN #1#2#3 + { + \tl_set:Nn \l__cmd_signature_tl {#2} + \exp_after:wN #3 \l__cmd_fn_tl ##1 #1 + { \__cmd_add_arg:n {##1} #1 } + \l__cmd_fn_tl + } + \cs_new_protected:Npn \sseq__cmd_add_type_U:w #1 + { + \__cmd_flush_m_args: + \__cmd_add_default: + \__cmd_add_grabber:N U + \tl_put_right:Nn \l__cmd_signature_tl { {#1} } + \__cmd_prepare_signature:N + } } - \@ifpackagelater{xparse}{2017/02/08}{ - \@ifpackagelater{xparse}{2018/10/17}{ + \@ifpackagelater{xparse}{2018/10/17}{ \ifsseq@patchxparseU \the\sseq@patchxparseUnewcode \else % Assumptions failed, so just make U give an error (this isn't such a big deal since we don't use it for \d anymore). - \cs_new_protected:Npn \sseq__xparse_add_type_U:w #1 + \cs_new_protected:Npn \sseq__cmd_add_type_U:w #1 { \sseq@error{U-xparse-incompatible} } + \cs_new_eq:NN \sseq__xparse_add_type_U:w \sseq__cmd_add_type_U \fi }{ \the\sseq@patchxparseUnewcode @@ -105,7 +127,14 @@ \__xparse_add_arg_spec_mandatory:n { U {#1} } \__xparse_normalize_arg_spec_loop:n } -}{ + + \cs_new_protected:Npn \sseq__cmd_normalize_type_U:w #1 { + \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } + \__cmd_normalize_check_lu:N U + \__cmd_add_arg_spec_mandatory:n { U {#1} } + \__cmd_normalize_arg_spec_loop:n + } +}{ \cs_new_protected:Npn \sseq__xparse_normalize_type_U:w #1 { \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn } \__xparse_normalize_check_lu:N U @@ -116,14 +145,20 @@ } } % Expandable commands are a menace to us because they define a bunch of helper commands that we then have to keep track of. -% We are too lazy to do this, so force \l__xparse_grab_expandably_bool to be false. +% We are too lazy to do this, so force \l__cmd_grab_expandably_bool to be false. % This is backwards compatible (I think) because \bool_set_false:N just performs a chardef (no existence check) -% so in old versions, \l__xparse_grab_expandably_bool will be created harmlessly. -\let\sseq__xparse_prepare_signature:n\__xparse_prepare_signature:n -\pretocmd\sseq__xparse_prepare_signature:n { \bool_set_false:N \l__xparse_grab_expandably_bool } {}{\error} +% so in old versions, \l__cmd_grab_expandably_bool will be created harmlessly. +\let\sseq__cmd_prepare_signature:n\__cmd_prepare_signature:n +\ifx\sseq__cmd_prepare_signature:n\undefined + \let\sseq__cmd_prepare_signature:n\__xparse_prepare_signature:n +\fi +\pretocmd\sseq__cmd_prepare_signature:n { \bool_set_false:N \l__cmd_grab_expandably_bool } {}{\error} % I would like to patch the \__xparse_grab_U:w's in my commands into \sseq__xparse_grab_U:w's but I can't because of -NoValue-. -\def\sseq@install@xparse@Uarggrabber{ \cs_set_eq:NN \__xparse_grab_U:w \sseq__xparse_grab_U:w } +\def\sseq@install@xparse@Uarggrabber{% + \cs_set_eq:NN \__xparse_grab_U:w \sseq__xparse_grab_U:w + \cs_set_eq:NN \__cmd_grab_U:w \sseq__cmd_grab_U:w +} %%% \sseq@DeclareDocumentCommand % @@ -151,10 +186,13 @@ \cs_new_protected:Npn\sseq@DeclareDocumentCommandAs#1#2#3#4{ \group_begin: + \cs_set_eq:NN \__cmd_add_type_U:w \sseq__cmd_add_type_U:w \cs_set_eq:NN \__xparse_add_type_U:w \sseq__xparse_add_type_U:w + \cs_set_eq:NN \__cmd_normalize_type_U:w \sseq__cmd_normalize_type_U:w \cs_set_eq:NN \__xparse_normalize_type_U:w \sseq__xparse_normalize_type_U:w - \cs_set_eq:NN \__xparse_prepare_signature:n \sseq__xparse_prepare_signature:n - %\cs_set:Npn \__xparse_declare_cmd_code:Nnn {\bool_set_false:N \l__xparse_grab_expandably_bool\__xparse_declare_cmd_code_aux:Nnn} + \cs_set_eq:NN \__cmd_prepare_signature:n \sseq__cmd_prepare_signature:n + \cs_set_eq:NN \__xparse_prepare_signature:n \sseq__cmd_prepare_signature:n + %\cs_set:Npn \__cmd_declare_cmd_code:Nnn {\bool_set_false:N \l__cmd_grab_expandably_bool\__cmd_declare_cmd_code_aux:Nnn} \sseq@installmsghooks \def\sseq@error@setup{} \def\sseq@error@cleanup{\sseq@errortrue} @@ -209,7 +247,7 @@ \newtoks\sseq@macro@defaultarggetters@toks \cs_new_protected:Npn\DeclareSseqCommand#1#2#3{% - \cs_if_exist:cTF { sseq @ builtin @ \cs_to_str:N #1 } {\sseq@error@x{wont-override-system-macro}{\string#1}\sseq@break} {} + \cs_if_exist:cTF { sseq @ \cs_to_str:N #1 @@unique@@ start} {\sseq@error@x{wont-override-builtin}{\string#1}\sseq@break} {} \cs_if_free:cT { sseq @ usermacro @ \cs_to_str:N #1 } { \sseq@x@addto@macro { \sseq@installmacros } { \let \exp_not:N #1 \exp_not:c { sseq @ usermacro @ \cs_to_str:N #1 } } } @@ -344,7 +382,8 @@ \egroup -% When there are arguments with default values (O, D, R, G), we need to put them into temporary macros to compare them and see if they are the default value +% When there are arguments with default values (O, D, R, G), we need to put them +% into temporary macros to compare them and see if they are the default value % that's what \sseq@macro@defaultarggetters@toks is for. \def\sseq@parseargspec#1#2{% \sseq@tempcount=\z@ diff --git a/graphics/pgf/contrib/spectralsequences/sseqmain.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqmain.code.tex index d9429f2215..6456f99b4b 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqmain.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqmain.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqmain.code.tex @@ -103,9 +103,10 @@ \@xp\@nx\csname pgfk@/sseqpages/global/{\sseq@currentoptionpath} options/.@cmd\endcsname } \sseq@savedpaths@xadd{\@nx\sseq@style@object{\sseq@stylelist}} - \sseq@savedpaths@add{\begingroup} % prevent some of the two-pass user macros horrors + \sseq@savedpaths@add{\begingroup\sseq@startcontentmarker} % prevent some of the two-pass user macros horrors \let\sseq@error@setup\sseq@error@setup@withinfo } +\let\sseq@startcontentmarker\relax % Just store all the settings \def\endsseqdata{% @@ -152,6 +153,8 @@ \gdef\sseq@pagecleanup{}% For undoing local option settings % \def\sseq@thepage{0}% page defaults to 0 + \def\thepage{\sseq@printpageas} + \def\page{\sseq@printnum@inftytosymbol{\sseq@thepage}} \sseq@thepagecount=\z@ \pgfqkeys{/sseqpages/global/name only}{#1}% Get the name \sseq@tempiftrue @@ -240,26 +243,66 @@ \@xp\sseq@break \fi % - \sseq@tempdimen = \dimexpr \textwidth -\sseq@clip@padding@right - \sseq@xaxis@end@extend - \sseq@xaxis@start@extend - \sseq@yaxisgap \relax - \sseq@tempcount = \numexpr \sseq@tempdimen /\sseq@xscalecm \relax - \ifnum \numexpr\sseq@xmax-\sseq@xmin + 1 > \sseq@tempcount - \pgfmathparse{\sseq@tempdimen/1cm/(\sseq@xmax-\sseq@xmin+1)} - \sseq@error@xxxx{range-overflow}{x} - {from \sseq@xmin\space to \sseq@xmax\space (xmax - xmin = \the\numexpr\sseq@xmax-\sseq@xmin)} - {\the\sseq@tempcount}% max x range - {\pgfmathresult}% max xscale - %\@xp\sseq@break - \fi + \sseq@setlayoutparameters + \ifsseq@rangecheck + % Calculate available space + + % We might need to know the dimensions of the tick marks in order to calculate "margin" size. + \bgroup + \@xp\tikzset\@xp{\sseq@xtickstyle} + \pgfmathparse{height("\sseq@xmin") + depth("\sseq@xmin")} + \edef\sseq@xlabelheight{\pgfmathresult pt} + \sseq@smuggle@macro\sseq@xlabelheight + \egroup + \bgroup + \@xp\tikzset\@xp{\sseq@ytickstyle} + \pgfmathparse{max(width("\sseq@ymax"), width("\sseq@ymin"))} + \edef\sseq@maxylabelwidth{\pgfmathresult pt} + \sseq@smuggle@macro\sseq@maxylabelwidth + \egroup + + % "totaldirmargin" isn't really quite margin: it's the distance between + % the bounding box (xmin, ymin) -- (xmax, ymax) and the bounding box of + % the resulting figure. % - \sseq@tempdimen = \dimexpr \textheight - \sseq@clip@padding@top - \sseq@yaxis@end@extend - \sseq@yaxis@start@extend - \sseq@xaxisgap \relax - \sseq@tempcount = \numexpr \sseq@tempdimen /\sseq@yscalecm \relax - \ifnum \numexpr\sseq@ymax-\sseq@ymin +1 > \sseq@tempcount - \pgfmathparse{\sseq@tempdimen/1cm/(\sseq@ymax-\sseq@ymin+1)} - \sseq@error@xxxx{range-overflow}{y} - {from \sseq@ymin\space to \sseq@ymax\space (ymax - ymin = \the\numexpr\sseq@ymax-\sseq@ymin)} - {\the\sseq@tempcount}% max x range - {\pgfmathresult}% max xscale - \@xp\sseq@break + % By subtracting the "margin" distance from the page width / height, we + % get the amount of space available for the content. + \sseq@tempxdimen = \dimexpr \linewidth - \sseq@totalhorizontalmargin@yborder - 0.1pt + \sseq@tempydimen = \dimexpr \textheight - \sseq@totalverticalmargin@xborder - 0.1pt +% + \ifsseq@rangecheck@sideways + % Swap availability measurements + \sseq@tempdimen=\sseq@tempxdimen + \sseq@tempxdimen=\sseq@tempydimen + \sseq@tempydimen=\sseq@tempdimen + \fi +% + % \showthe\dimexpr\dimexpr \sseq@tempxdimen - \sseq@xscale cm * (\sseq@xmax-\sseq@xmin)\relax + % Compare space available to range * scale. + \ifdim \sseq@tempxdimen < \dimexpr \sseq@xscale cm * (\sseq@xmax-\sseq@xmin)\relax + % this will divide by zero if somehow we overflow the space on page + % while the range is 0. Hopefully no one will ever manage that. + \pgfmathparse{\sseq@tempxdimen/1cm/(\sseq@xmax-\sseq@xmin)} % max x range + \sseq@tempx = \numexpr \sseq@tempxdimen /\sseq@xscalecm \relax % max xscale + \sseq@error@xxxx{range-overflow}{x} + {from \sseq@xmin\space to \sseq@xmax\space (xmax - xmin = \the\numexpr\sseq@xmax-\sseq@xmin)} + {\the\sseq@tempx}% max x range + {\pgfmathresult}% max xscale + %\@xp\sseq@break + \fi +% + \relax % Not sure why we need this... +% + % \showthe\dimexpr\dimexpr \sseq@tempydimen - \sseq@yscale cm * (\sseq@ymax-\sseq@ymin)\relax + \ifdim \sseq@tempydimen < \dimexpr \sseq@yscale cm * (\sseq@ymax-\sseq@ymin)\relax + \sseq@tempy = \numexpr \sseq@tempydimen /\sseq@yscalecm \relax % max y range + \pgfmathparse{\sseq@tempydimen/1cm/(\sseq@ymax-\sseq@ymin)} % max yscale + \sseq@error@xxxx{range-overflow}{y} + {from \sseq@ymin\space to \sseq@ymax\space (ymax - ymin = \the\numexpr\sseq@ymax-\sseq@ymin)} + {\the\sseq@tempy}% max y range + {\pgfmathresult} % max yscale + %\@xp\sseq@break + \fi \fi % % Really this could be anything between -\sseq@xmin and -\sseq@xmax and it wouldn't matter. We'll split the difference. @@ -267,13 +310,18 @@ \sseq@yoffset=\numexpr\sseq@intdivceiling{\numexpr-\sseq@ymin-\sseq@ymax\relax}{\numexpr4*\sseq@ygridstep\relax}*(2*\sseq@ygridstep)\relax % % + \def\sseq@temp{\sseq@novalue} + \ifx\sseq@printpageas\sseq@temp + \def\sseq@printpageas{Page $2$ (all differentials)}% + \fi +% +% \tikzset{ z=0pt, every path/.style={}, every node/.style={} } \let\errmessage\sseq@errmessage@std - \sseq@setlayoutparameters \begin{tikzpicture}[/sseqpages/global/{default} options,\ifsseq@hasname/sseqpages/global/{\sseq@thename} options\fi,/sseqpages/global/{this page} options]% \sseq@sseqstyle@globalpart \sseq@globaldetonetransform @@ -290,7 +338,7 @@ % Axes labels only occur once per page, so the cost of typesetting them with tikz doesn't matter ... THANK GOD \ifx\sseq@title\pgfutil@empty\else \ifsseq@drawtitle - \sseq@eval{\@nx\path (0,-\sseq@yoffset) node[ + \sseq@eval{\@nx\node[ /sseqpages/global/every title, above=\sseq@topclippadding+5pt ] {\unexpanded\expandafter{\sseq@title}}; @@ -376,6 +424,7 @@ \let\sseq@class@drawnode\sseq@copypage@addclass \let\sseq@differential@object\@gobble \let\sseq@structline@draw\sseq@copypage@addstructline + \let\sseq@extension@draw\sseq@copypage@addextension \let\sseq@tikzpath@object\@gobble \let\sseq@pgfkeysdocommand\@gobbletwo \sseq@savedpaths @@ -394,6 +443,10 @@ \sseq@x@addto@macro\sseq@copymacro{\@nx\sseq@structline@copy{\sseq@thename}{#1}} } +\def\sseq@copypage@addextension#1{ + \sseq@x@addto@macro\sseq@copymacro{\@nx\sseq@extension@copy{\sseq@thename}{#1}} +} + %%% Scope \newcount\sseq@scope@savestackid @@ -478,6 +531,7 @@ } + %%%%% %% %% The main commands @@ -583,7 +637,7 @@ \sseq@obj@xdef{\classname.needstikz}{\sseq@needstikztrue}% \fi \@ifundefined{sseq@tempoffset}{}{% - \tikz@scan@one@point\sseq@setoffset\sseq@tempoffset + \@xp\tikz@scan@one@point\@xp\sseq@setoffset\sseq@tempoffset }% \ifx\sseq@tooltip\pgfutil@empty\else \sseq@obj@protectedxdef{\classname.tooltip}{\sseq@tooltip} @@ -761,7 +815,7 @@ \fi \@ifundefined{sseq@tempoffset}{}{ \sseq@cleanup@obj{\classname.offset} - \tikz@scan@one@point\sseq@setoffset\sseq@tempoffset + \@xp\tikz@scan@one@point\@xp\sseq@setoffset\sseq@tempoffset } \ifnum\sseq@tempcount<\sseq@genmax\repeat \sseq@breakpoint @@ -833,6 +887,7 @@ } \def\sseq@replaceclassmain#1{ + \sseq@pushstack@\coord \sseq@options@firstpassmode \the\sseq@sseqstyle \the\sseq@classstyle @@ -844,19 +899,19 @@ \sseq@processlabels \sseq@obj@ifundef{class.\coord.num}{\sseq@error@x{replaceclass-no-class}{\coordname}\sseq@break}{} \sseq@ifdead\coord{}{\sseq@error@x{replaceclass-not-dead-yet}{\coordname}\sseq@break} -% \edef\oldclassname{class.\coord[\sseq@obj{class.\coord.num}]} +% \ifsseq@keepchanges\else +% \ifnum\the\numexpr\sseq@obj{\oldclassname.page}<\sseq@thepagecount\else +% \edef\sseq@temp{\sseq@obj{\oldclassname.page}} +% \sseq@error@xxx{replaceclass-no-effect-on-this-page}{\coord}{\sseq@temp}{\the\numexpr\sseq@temp+\@ne}% warning +% \sseq@breakfifi +% \fi +% \fi +% \sseq@cleanup@obj{class.\coord.num} \sseq@obj@inc{class.\coord.num} \edef\classname{class.\coord[\sseq@obj{class.\coord.num}]} -% - \ifsseq@keepchanges\else - \ifnum\the\numexpr\sseq@obj{\oldclassname.page}<\sseq@thepagecount\else - \edef\sseq@temp{\sseq@obj{\oldclassname.page}} - \sseq@error@xxx{replaceclass-no-effect-on-this-page}{\coord}{\sseq@temp}{\the\numexpr\sseq@temp+\@ne}% warning - \sseq@breakfifi - \fi - \fi + %\show\classname % \let\partialcoord\coord@partial \ifx\sseq@class@tag\pgfutil@empty\else @@ -908,11 +963,44 @@ \ifsseq@needstikz \sseq@obj@xdef{\classname.needstikz}{\sseq@needstikztrue} \fi - \@ifundefined{sseq@tempoffset}{}{\tikz@scan@one@point\sseq@setoffset\sseq@tempoffset} + \@ifundefined{sseq@tempoffset}{}{\@xp\tikz@scan@one@point\@xp\sseq@setoffset\sseq@tempoffset} % \sseq@breakpoint \endgroup } + +\sseq@DeclareDocumentCommand\replacestructlines{od()}{% + \begingroup + \sseq@loadinputline + \sseq@xsetthiscall{\string\replaceclass\IfNoValueF{#1}{[\unexpanded{#1}]}\unexpanded{(#2)}} +% + \IfNoValueTF{#2}{ + \def\sseq@coord{\lastclass0} + }{ + \def\sseq@coord{#2} + } + \sseq@parsecoord\coord{\sseq@coord}{coordinate passed to \string\replaceclass}% +% + % TODO: error handling here... +% + \edef\sseq@classnum{\sseq@obj{class.\coord.num}}% + \ifnum\sseq@classnum=0\relax + \sseq@error@x{replacestructlines-class-not-replaced}{\coordname}\sseq@breakfi + \fi + \edef\classname{class.\coord[\sseq@classnum]}% + %\show\classname + \edef\oldclassname{class.\coord[\the\numexpr\sseq@obj{class.\coord.num}-1]}% + \sseq@cleanup@obj{\classname.dependencies}% + \sseq@obj@gletobj{\classname.dependencies}{\oldclassname.dependencies}% + %\sseq@obj@show{\classname.dependencies} + \sseq@obj@map{\classname.dependencies}{ + \sseq@cleanup@obj{##1.page}% + \sseq@obj@gletobj{##1.page}{##1.page.old}% + } + \sseq@breakpoint + \endgroup +} + \def\sseq@class@draw@ifpage#1{ \bgroup \sseq@obj@pagetogen{#1}{\sseq@thepage} % sets \sseq@gen @@ -1045,6 +1133,14 @@ % #2 -- page % #3 -- source coordinate \def\sseq@d@d#1#2{%% + \sseq@obj@ifdef{class.\source.hasextension}{ + \sseq@error@xxx{d-class-has-extension}{source}{\sourcename}{#2} + \sseq@break + }{} + \sseq@obj@ifdef{class.\target.hasextension}{ + \sseq@error@xxx{d-class-has-extension}{target}{\targetname}{#2} + \sseq@break + }{} \sseq@d@setpageminrec{class.\source}{#2}{source}% automatically handles \sseq@cleanup@obj \sseq@d@setpageminrec{class.\target}{#2}{target} %%% This is the last point we might break, so now the differential is good. @@ -1076,7 +1172,7 @@ \sseq@cleanup@obj{d.#2\source\target.familylist} \sseq@obj@xoaddto{d.#2\source\target.familylist}{\sseq@familylist} \sseq@cleanup@obj{d.#2\source\target.options} - \sseq@obj@xoaddto{d.#2\source\target.options}{\sseq@savedoptioncode} + \sseq@obj@xaddto{d.#2\source\target.options}{\ifsseq@needstikz\@nx\sseq@needstikztrue\fi\unexpanded\@xp{\sseq@savedoptioncode}} } % Some helper macros: @@ -1089,6 +1185,8 @@ \sseq@cleanup@obj{#1[\sseq@obj{#1.num}].deathline} \sseq@d@setpageclass{#1}{#2}{#3} \sseq@obj@map{#1[\sseq@obj{#1.num}].dependencies}{ + %\def\temp{##1}\show\temp + %\sseq@obj@show{#1[\sseq@obj{#1.num}].dependencies} \sseq@d@setpagemin{##1}{#2} % automatically handles cleanup } } @@ -1173,6 +1271,8 @@ \ifnum\sseq@obj{#1.page}>#2\relax \ifnum\sseq@obj{#1.pagemin}>#2\relax\else % prevent a d1 from getting rid of a structline that was supposed to start on page 5 \sseq@cleanup@obj{#1.page} + \sseq@cleanup@obj{#1.page.old} + \sseq@obj@gletobj{#1.page.old}{#1.page} \sseq@obj@xdef{#1.page}{#2} \fi \fi @@ -1258,6 +1358,7 @@ }% \sseq@parsecoord\source{\sourcename}{source of structure line}% \sseq@parsecoord\target{\targetname}{target of structure line}% + % Sort \xsource and \xtarget. This is to ensure that if a person adds \ifnum\xsource>\xtarget\relax \sseq@parsedcoords@swap\source\target \else @@ -1270,14 +1371,15 @@ \sseq@parsedcoords@swap\source\target \else \ifnum\nsource=\ntarget\relax - \sseq@error{structline-source-target-equal}% - \@xp\sseq@break\romannumeral-`0 + \sseq@error@n{edge-source-target-equal}{\structline}% + \sseq@fbreak \fi \fi \fi \fi \fi \fi + \relax % stop fbreak \@ifundefined{sseq@structline@page}{%this is repeated in circleclasses \def\sseq@pagemin{0} \ifnum\sseq@obj{class.\source.num}>\z@ @@ -1462,6 +1564,152 @@ \def\sseq@structline@draw#1{\sseq@eval{\@nx\sseq@drawedge\sseq@obj{#1.source}\sseq@obj{#1.target}{structline}{\@nx\sseq@obj{#1.options}}}} + +\sseq@DeclareDocumentCommand\extension{od()}{% + \begingroup + \sseq@loadinputline + \IfNoValueTF{#2}{ + \sseq@extension@main{extension}{#1}{#2}{#2} + }{ + \def\next{\sseq@extension@@{extension}{#1}{#2}}% + \@xptwo\next\sseq@trimleadingspaces + } +} +\sseq@DeclareDocumentCommand\extensionoptions{od()}{% + \begingroup + \sseq@loadinputline + \IfNoValueTF{#2}{ + \sseq@structline@main{extensionoptions}{#1}{#2}{#2} + }{ + \def\next{\sseq@extensionoptions@@{extensionoptions}{#1}{#2}}% + \@xptwo\next\sseq@trimleadingspaces + } +} + +\sseq@DeclareDocumentCommandAs\sseq@extension@@\extension{mmmd()}{% + \sseq@extension@main{#1}{#2}{#3}{#4} +} + +\sseq@DeclareDocumentCommandAs\sseq@extensionoptions@@\extensionoptions{mmmd()}{% + \sseq@extension@main{#1}{#2}{#3}{#4} +} + +\def\sseq@extension@main#1#2#3#4{ + \sseq@xsetthiscall{\string\extension\IfNoValueF{#2}{\unexpanded{[#2]}}\IfNoValueF{#3}{\unexpanded{(#3)}\IfNoValueF{#4}{\unexpanded{(#4)}}}}% + \def\sseq@edgetype{structline} + \sseq@options@firstpassmode + \the\sseq@sseqstyle + \the\sseq@edgestyle + \the\sseq@structlinestyle + \the\sseq@scope@toks + \sseq@options@normalmode + \IfNoValueF{#2}{% + \sseq@processoptions{extension}{#2}% Outputs result into \sseq@savedoptioncode + }% + \def\sourcename{#3}% + \def\targetname{#4}% + \IfNoValueTF{#3}{% + \def\sourcename{\lastclass1}% + \def\targetname{\lastclass}% + }{% + \IfNoValueT{#4}{% + \def\targetname{\lastclass}% + }% + }% + \sseq@parsecoord\source{\sourcename}{source of extension}% + \sseq@parsecoord\target{\targetname}{target of extension}% + \ifnum\xsource>\xtarget\relax + \sseq@parsedcoords@swap\source\target + \else + \ifnum\xsource=\xtarget\relax + \ifnum\ysource>\ytarget\relax + \sseq@parsedcoords@swap\source\target + \else + \ifnum\ysource=\ytarget\relax + \ifnum\nsource>\ntarget\relax + \sseq@parsedcoords@swap\source\target + \else + \ifnum\nsource=\ntarget\relax + \sseq@error@n{edge-source-target-equal}{\extension}% + \sseq@fbreak + \fi + \fi + \fi + \fi + \fi + \fi + \relax % stop fbreak + \csname sseq@extension@#1\endcsname + \sseq@breakpoint + \endgroup +} +\def\sseq@extension@extension{ + \ifnum\sseq@obj{class.\source[\sseq@obj{class.\source.num}].page}<\sseq@infinity\relax + \sseq@error{extension-stillborn} + \sseq@breakfi + \fi + \ifnum\sseq@obj{class.\target[\sseq@obj{class.\target.num}].page}<\sseq@infinity\relax + \sseq@error{extension-stillborn} + \sseq@breakfi + \fi + \edef\sseq@extensionname{extension.\source\target} + \sseq@obj@ifdef{\sseq@extensionname.source}{% + \sseq@error@xx{extension-already-exists}{\sourcename}{\targetname} + \sseq@breakfi + }{ + \sseq@savedpaths@addextension{extension.\source\target} + } + \sseq@cleanup@obj{class.\source.hasextension} + \sseq@obj@gdef{class.\source.hasextension}{} + \sseq@cleanup@obj{class.\target.hasextension} + \sseq@obj@gdef{class.\target.hasextension}{} + \sseq@cleanup@obj{\sseq@extensionname.source} + \sseq@obj@xdef{\sseq@extensionname.source}{\source} + \sseq@obj@xdef{\sseq@extensionname.target}{\target} + \sseq@obj@xodef{\sseq@extensionname.familylist}{\sseq@familylist} + \sseq@cleanup@obj{\sseq@extensionname.options} + \sseq@obj@xdef{\sseq@extensionname.options}{\ifsseq@needstikz\@nx\sseq@needstikztrue\fi\unexpanded\@xp{\sseq@savedoptioncode}} +} +\def\sseq@extension@extensionoptions{ + \edef\sseq@extensionname{extension.\source\target} + \sseq@obj@ifundef{\sseq@extensionname.source}{ + \sseq@error@n{cmdoptions-feature-doesn't-exist}{\extension} + \sseq@break + }{} + \sseq@cleanup@obj{\sseq@extensionname.options} + \sseq@cleanup@obj{\sseq@extensionname.familylist} + \ifsseq@needstikz + \sseq@obj@gaddto{\sseq@extensionname.options}{\sseq@needstikztrue} + \fi + \sseq@obj@xoaddto{\sseq@extensionname.options}{\sseq@savedoptioncode} + \sseq@obj@xoaddto{\sseq@extensionname.familylist}{\sseq@familylist} +} + +\def\sseq@extension@copy#1#2{ + \begingroup + \sseq@structline@copy@decomposename#2 + \let\sseq@thename@saved\sseq@thename + \def\sseq@pagemin{0} + \sseq@parsecoord\source{\sourcename}{source of structure line}% + \sseq@parsecoord\target{\targetname}{target of structure line} + \def\sseq@thename{#1} + \sseq@lettoobj\sseq@familylist{#2.familylist} + \sseq@lettoobj\sseq@savedoptioncode{#2.options} + \let\sseq@thename\sseq@thename@saved + \sseq@extension@extension + \endgroup +} + + +\def\sseq@extension@draw@ifpage#1{ + \bgroup + \ifnum\sseq@thepage=\sseq@infinity\relax + \sseq@extension@draw{#1} + \fi + \egroup +} +\def\sseq@extension@draw#1{\sseq@eval{\@nx\sseq@drawedge\sseq@obj{#1.source}\sseq@obj{#1.target}{structline}{\@nx\sseq@obj{#1.options}}}} + %% This is a dumb place to put this. It has to be after the differential commands are defined. \ifsseq@draftmode % Okay, have to dummy out all the main commands. % Only add tikz background paths to the savedpaths. We need to draw background paths because they might change the bounding box! @@ -1515,12 +1763,30 @@ \sseq@DeclareDocumentCommand\replacesource{o}{} \sseq@DeclareDocumentCommand\replacetarget{o}{} \def\sseq@d@main#1#2#3#4#5{} - \DeclareDocumentCommand \sseq@DrawIfValidDifferential@@ { d() d() } {} + \DeclareDocumentCommand \sseq@DrawIfValidDifferential@ { mmO{} } { + \sseq@loadinputline + \def\sseq@dtype{d} + \def\sseq@trueclause{#1} + \def\sseq@falseclause{#2} + \sseq@d@grabpage\sseq@DrawIfValidDifferential@@ + } + \DeclareDocumentCommand \sseq@DrawIfValidDifferential@@ { d() d() } { + \csname sseq@DrawIfValidDifferential@@handle@truefalse% + @@\sseq@trueclause\sseq@falseclause + \endcsname + } + % Have to do something in case it branches. We somewhat arbitrarily always + % pretend it branched yes. + \def\sseq@DrawIfValidDifferential@@handle@truefalse@@{} + \def\sseq@DrawIfValidDifferential@@handle@truefalse@@T{\@firstofone} + \def\sseq@DrawIfValidDifferential@@handle@truefalse@@F{\@gobble} + \def\sseq@DrawIfValidDifferential@@handle@truefalse@@TF{\@firstoftwo} + \sseq@DeclareDocumentCommand\structline{od()d()}{} \sseq@DeclareDocumentCommand\structlineoptions{od()d()}{} \sseq@DeclareDocumentCommand\circleclasses{or()r()}{} \sseq@DeclareDocumentCommand\gettag{mr()}{} - \endinput + \expandafter\endinput \fi diff --git a/graphics/pgf/contrib/spectralsequences/sseqmessages.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqmessages.code.tex index 0033bb4a2e..fc735f3014 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqmessages.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqmessages.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqmessages.code.tex @@ -275,7 +275,7 @@ \def\sseq@error@xxxx{\msg_error:nnxxxx{spectralsequences}} \def\sseq@warning {\msg_warning:nn{spectralsequences}} -\def\sseq@newerror#1#2{\msg_new:nnn{spectralsequences}{#1}{#2}} +\def\sseq@newerror#1#2{\msg_new:nnn{spectralsequences}{#1}{#2\sseq@errorinfo}} \def\sseq@newerror@internal#1#2{\msg_new:nnn{spectralsequences}{#1}{Internal error: #2 \sseq@contactpackageauthor}} \edef\sseq@contactpackageauthor{Contact package author \sseq@authorname\space at \sseq@authoremail.} @@ -285,6 +285,7 @@ \cs_new_eq:NN \__sseq_hooked_msg_error_code:nnnnnn \__msg_error_code:nnnnnn \cs_new_eq:NN \__sseq_hooked_msg_warning_code:nnnnnn \__msg_warning_code:nnnnnn \cs_new_eq:NN \__sseq_hooked_msg_info_code:nnnnnn \__msg_info_code:nnnnnn +\cs_new_eq:NN \__sseq_hooked_interupt_wrap:nnn \__msg_interrupt_wrap:nnn \cs_new:Npn \sseq@installmsghooks {% @@ -294,12 +295,13 @@ \cs_set_eq:NN \__msg_error_code:nnnnnn \__sseq_hooked_msg_error_code:nnnnnn \cs_set_eq:NN \__msg_warning_code:nnnnnn \__sseq_hooked_msg_warning_code:nnnnnn \cs_set_eq:NN \__msg_info_code:nnnnnn \__sseq_hooked_msg_info_code:nnnnnn + \cs_set_eq:NN \__msg_interrupt_wrap:nnn \__sseq_hooked_interupt_wrap:nnn } \sseq@newerror@internal{msg-patch-failed}{Failed to patch the latex 3 message system. The errors will not be as expressive.} \def\sseq@msgpatchfailed{ - \msg_error:nn{spectralsequences}{msg-patch-failed} + \msg_warning:nn{spectralsequences}{msg-patch-failed} \def\sseq@installmsghooks{} \sseq@break } @@ -310,7 +312,6 @@ \pretocmd\__sseq_hooked_msg_see_documentation_text:n{\sseq@errorinfo}{}{\sseq@msgpatchfailed} - \pretocmd\__sseq_hooked_msg_fatal_code:nnnnnn {\sseq@error@setup} {}{\sseq@msgpatchfailed} \pretocmd\__sseq_hooked_msg_error_code:nnnnnn {\sseq@error@setup} {}{\sseq@msgpatchfailed} %\pretocmd\__sseq_hooked_msg_warning_code:nnnnnn{\sseq@msg@setup} {}{\sseq@msgpatchfailed} @@ -319,6 +320,7 @@ \apptocmd\__sseq_hooked_msg_error_code:nnnnnn {\sseq@error@cleanup}{}{\sseq@msgpatchfailed} %\apptocmd\__sseq_hooked_msg_warning_code:nnnnnn{\sseq@error@cleanup}{}{\sseq@msgpatchfailed} %\apptocmd\__sseq_hooked_msg_info_code:nnnnnn {\sseq@error@cleanup}{}{\sseq@msgpatchfailed} +\patchcmd \__sseq_hooked_interupt_wrap:nnn {\str_count:N\l__msg_text_str-\str_count:N\l__msg_name_str +2} {2} {}{\sseq@msgpatchfailed} \sseq@breakpoint @@ -355,7 +357,6 @@ \sseq@newerror@internal{expl3-incompatibility}{Since this version of spectralsequences, the expl3 definition of #1 was updated in an incompatible way.} - \sseq@newerror@internal{this-shouldnt-happen}{This branch of the code should be unreachable. Something really weird has happened. Error occurred in #1.} % Convexity thing @@ -377,7 +378,7 @@ %% %% \sseq@newerror@internal{U-xparse-incompatible}{The 'U' argument type is incompatible with the current version of xparse.} -\sseq@newerror{won't-override-builtin}{Macro '#1' is a spectralsequences builtin and I won't override it. Try a different name.} +\sseq@newerror{wont-override-builtin}{Macro '#1' is a spectralsequences built in and I won't override it. Try a different name.} \sseq@newerror{usermacro-not-free}{Macro '#1' has already been defined using \string\DeclareSseqCommand, \string\NewSseqCommand, \string\DeclareSseqGroup, or \string\NewSseqGroup. I am overriding it. If this is what you intended, you should either use \@nx\DeclareSseqGroup or \string\DeclareSseqCommand, which won't complain.} \sseq@newerror{macro-patch-failed}{Failed to patch macro '#1'. This is probably some annoying catcode issue. Try \@nx\tracingpatches to see more information about why the patch failed.} @@ -389,9 +390,10 @@ %% %% \sseq@newerror{classpattern-already-defined}{Class pattern '#1' already defined. Overwriting it.} +\sseq@newerror{classpattern-invalid-math-expression}{Expression '#1' encountered in class pattern definition is not a valid math expression. Skipping the definition.} \sseq@newerror{classpattern-unexpected-token}{Unexpected token '#1' in class pattern definition. Skipping the definition.} \sseq@newerror{classpattern-missing-tokens}{Incomplete class pattern definition. Skipping the definition.} -\sseq@newerror{classpattern-extra-coord-ignored}{Extra coordinate '#1' ignored. You probably forgot a semicolon.} +\sseq@newerror{classpattern-extra-coord-ignored}{Extra coordinate '#1' ignored in row #2. You probably forgot a semicolon.} \sseq@newerror{classpattern-too-few-coords}{Too few coordinates in row #1.} \sseq@newerror{classpattern-too-many-classes}{% @@ -406,11 +408,12 @@ \sseq@newerror{class-no-tag}{The class #1 has no tag so I cannot get it.} \sseq@newerror{class-extra-coords}{Too many coordinates. Ignoring the extra ones.} -\sseq@newerror{named-coordinate-class}{You can't pass a named coordinate to \string\class.} % Probably not actually possible to obtain this error +\sseq@newerror{named-coordinate-class}{You can't pass a named coordinate to \string\class.} + \sseq@newerror{d-no-degree}{% - You must specify the degree of your spectral sequence if you want to use the differential command \string\d. + If you want to use the differential command \string\d\ you must either specify the grading of the differential or explicitly provide a target coordinate for the differential. Specify the degree by providing 'degree={f(\#1)}{g(\#1)}' as an option to '\string\begin{sseqdata}', - where f(\#1) and g(\#1) are formulas for the x and y degree of the \#1th page differential.% + where f(\#1) and g(\#1) are formulas for the x and y degree of the \#1th page differential. Alternatively, you may say e.g., '\string\d2(source)(target)'% } \sseq@newerror{d-named-coord-two-indexes}{You provided a named class and two indexes, but the named class already comes with an index so you can only provide one more for the target. Ignoring the second index.}% should be a warning \sseq@newerror{d-target-index-target-coord}{You provided both a target index and a target coordinate, but this overdetermines the differential. Ignoring the target index.} @@ -461,7 +464,7 @@ or '\string\begin{sseqpage}[#1\sseq@possiblecurrentvaluemean]').% } -% Applies to name and page, and saying "sseqs={name=somename}" is just a bad idea. +% Applies to name and page. Saying "sseqs={name=somename}" is a bad idea. \sseq@newerror{option-no-default-allowed}{% You cannot set a default value for '#1'.% Try \@nx\sseqset{sseqs={#1\ifx\pgfkeyscurrentvalue\pgfkeysnovalue@text\else=\pgfkeyscurrentvalue\fi}}.% } @@ -550,7 +553,7 @@ \sseq@newerror{replaceclass-not-dead-yet}{I cannot replace the class at #1 because it seems to be alive and well.} \sseq@newerror{replaceclass-no-effect-on-this-page}{The class at #1 died on page #2 so replacing it only affects pages after #3, but the current page is \sseq@thepage.} % warning - +\sseq@newerror{replacestructlines-class-not-replaced}{I cannot replace the structlines on #1 because it has not been replaced.} \sseq@newerror{d-invalid-page}{Invalid page '#1'.} @@ -558,6 +561,7 @@ The #1 #2 of differential \sseq@thiscall\ on page #3 has already been the #4. Use \string\replaceclass#2 before \sseq@thiscall.% } +\sseq@newerror{d-class-has-extension}{The #1 #2 of differential \sseq@thiscall\ on page #3 has already been involved in an extension. If you are planning to replace it, move the \string\extension\ after the call to \string\replaceclass.} \sseq@newerror{d-hit-same-page-replaceclass}{%#1 <- #3, #2 <- \csname #3name\endcsname, #3 <- #2, #3 <-\sseq@obj{#1[\the\sseq@tempcount].deathinfo}, The #1 #2 of differential \sseq@thiscall\ was the #3. If multiple differentials touch a class on the same page, they cannot be separated by a \@nx\replaceclass command.% @@ -570,8 +574,9 @@ \sseq@newerror{structline-no-page-max}{You cannot provide \@nx\structline with the option "page=min--max", only with "page=min".} %warning \sseq@newerror{structline-already-exists}{Cannot add a structline from #1 to #2 because such a structline already exists.} -\sseq@newerror{structline-stillborn}{Structline dies before it is born. Perhaps you meant to specify a different source or target?} -\sseq@newerror{structline-source-target-equal}{The source and target of a \@nx\structline cannot be equal.} +\sseq@newerror{structline-stillborn}{#1 dies before it is born. Perhaps you meant to specify a different source or target?} +\sseq@newerror{extension-stillborn}{Either the source or target of extension is not currently alive. Perhaps you meant to specify a different source or target? Perhaps you forgot a call to \@nx\replaceclass?} +\sseq@newerror{edge-source-target-equal}{The source and target of a #1 cannot be equal.} \protected\def\sseq@quiet{\msg_redirect_module:nnn{spectralsequences}{error}{info}} diff --git a/graphics/pgf/contrib/spectralsequences/sseqparsers.code.tex b/graphics/pgf/contrib/spectralsequences/src/sseqparsers.code.tex index f6376a303c..b7452d89ae 100755..100644 --- a/graphics/pgf/contrib/spectralsequences/sseqparsers.code.tex +++ b/graphics/pgf/contrib/spectralsequences/src/sseqparsers.code.tex @@ -1,8 +1,8 @@ %% -%% Package: spectralsequences v1.2.2 2017-09-16 2017-09-16 +%% Package: spectralsequences v1.3.0 2021-07-18 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2019-02-18 +%% Date: 2021-07-18 %% License: Latex Project Public License %% %% File: sseqparsers.code.tex @@ -38,7 +38,16 @@ % Prevent \protect from causing trouble for \pgfmathparse \let\sseq@pgfmathparse@orig\pgfmathparse -\protected\def\sseq@pgfmathparse#1{\let\@@protect\protect\def\protect{}\sseq@pgfmathparse@orig{#1}\restore@protect} +\protected\def\sseq@pgfmathparse#1{% + \bgroup + \let\@@protect\protect + \def\protect{}% + \let\pgfmath@protected@edef\edef + \sseq@pgfmathparse@orig{#1}% + \restore@protect + \sseq@smuggle@macro\pgfmathresult + \egroup +} %%% ifpgfmathexpr @@ -344,7 +353,7 @@ \newcount\sseq@cp@row \newcount\sseq@cp@n -\def\sseqnewclasspattern#1#2{ +\def\SseqNewClassPattern#1#2{ \ifcsname sseq@#1xoffset1/1\endcsname\sseq@error@n{classpattern-already-defined}{#1}\fi % could be a warning \begingroup \def\sseq@name{#1} @@ -355,6 +364,7 @@ \let\next\sseq@newclasspattern@ \sseq@newclasspattern@#2\sseq@nil } +\let\sseqnewclasspattern\SseqNewClassPattern \def\sseq@newclasspattern@{ \@ifnextchar\bgroup{\sseq@error@n{classpattern-unexpected-token}{\{}}{\sseq@newclasspattern@processstate} @@ -371,7 +381,7 @@ \def\sseq@temp{} \def\sseq@state{ycoord} }{ - \sseq@error{classpattern-not-integer-expression} + \sseq@error@x{classpattern-invalid-math-expression}{\sseq@temp} \let\next\sseq@newclasspattern@abort } \else @@ -391,9 +401,9 @@ \let\sseq@tempy\sseq@mathresult \def\sseq@temp{} \def\sseq@state{nocoord} - \advance\sseq@cp@n\@ne + \advance\sseq@cp@n1\relax \ifnum\sseq@cp@n>\sseq@cp@row\relax - \sseq@error@x{classpattern-extra-coord-ignored}{(\sseq@tempx,\sseq@tempy)} + \sseq@error@xx{classpattern-extra-coord-ignored}{(\sseq@tempx,\sseq@tempy)}{\the\sseq@cp@row} \else \sseq@e@addto@macro\sseq@newclasspattern@dodefs{ \def\@xp\@nx\csname sseq@\sseq@name xoffset\the\sseq@cp@n/\the\sseq@cp@row\endcsname{\sseq@tempx} @@ -401,7 +411,7 @@ } \fi }{ - \sseq@error{classpattern-not-integer-expression} + \sseq@error@x{classpattern-invalid-math-expression}{\sseq@temp} \let\next\sseq@newclasspattern@abort } \else @@ -420,12 +430,12 @@ \def\sseq@state{xcoord} \else \ifx#1; - \ifnum\sseq@cp@n=\sseq@cp@row\relax - \advance\sseq@cp@row\@ne - \sseq@cp@n=\z@ - \else + \ifnum\sseq@cp@n<\sseq@cp@row\relax \sseq@error@x{classpattern-too-few-coords}{\the\sseq@cp@row} \let\next\sseq@newclasspattern@abort + \else + \advance\sseq@cp@row\@ne + \sseq@cp@n=\z@ \fi \else \ifx#1\sseq@nil @@ -480,13 +490,14 @@ % \sseq@parsecoord@maincoord -- separates a coordinate into {x,y}{n or tag}, numerically evaluates x and y, and adds in the values of \sseq@x and \sseq@y % \sseq@parsecoord@index -- decides which class {n or tag} represents % -% There are three interface commands: +% There are several interface commands: % \sseq@parsecoord -- for most things % \sseq@cparsecoord -- for \class (but not for \replaceclass or \classoptions). Doesn't use \sseq@parsecoord@index at all. % \sseq@dparsecoord -- for \d and \doptions % \sseq@parsecoordex -- for \isalive: the body of a page constraint needs to be \edef'd so we need a completely expandable version. % The expandable version doesn't have any error checking -- to get the error checking, we pass the coordinates once through the unexpandable version % inside of an hbox. +% \sseq@parsecoord@allownonexisting -- doesn't raise an error if the class doesn't exist. \def\sseq@errortype{} \def\sseq@printerrortype#1{\@xp\sseq@ifempty\@xp{\sseq@errortype}{}{#1 \sseq@errortype}} @@ -577,10 +588,14 @@ \def\sseq@errortype@tikzprim{tikz ~ primitive}% This is sort of a silly hack, but this first error check shouldn't happen in a tikz primitive. \def\sseq@parsecoord@index{% \sseq@obj@ifundef{partcoord.(\sseq@xycoord).numnodes}{ - \ifx\sseq@errortype\sseq@errortype@tikzprim - \def\sseq@index{}% Communicates to \sseq@tikzprimitives@coords@maybeclass that this is not a class + \ifsseq@parsecoord@allownonexisting + \ifx\sseq@rawindex\pgfutil@empty + \def\sseq@index{} % Communicates to \sseq@tikzprimitives@coords@maybeclass that this is not a class + \else + \sseq@error@x{no-classes}{(\sseq@xycoord)} \sseq@fbreak + \fi \else - \sseq@error@x{no-classes}{(\sseq@xycoord)}\@xp\sseq@break + \sseq@error@x{no-classes}{(\sseq@xycoord)} \sseq@fbreak \fi }{ \ifx\sseq@rawindex\pgfutil@empty @@ -595,14 +610,16 @@ \edef\sseq@index{\the\numexpr\sseq@obj{partcoord.(\sseq@xycoord).numnodes} + \sseq@rawindex + \@ne\relax}% \ifnum\sseq@index<\@ne \sseq@error@xxx{index-too-large}{\sseq@rawindex}{\sseq@obj{partcoord.(\sseq@xycoord).numnodes}}{(\sseq@xycoord)}% - \edef\sseq@index{1}% or maybe I should break? + \edef\sseq@index{1} + \sseq@fbreak \fi \else + \edef\sseq@index{\the\numexpr\sseq@rawindex} \ifnum\sseq@rawindexeval>\sseq@obj{partcoord.(\sseq@xycoord).numnodes}\relax \sseq@error@xxx{index-too-large}{\sseq@rawindex}{\sseq@obj{partcoord.(\sseq@xycoord).numnodes}}{(\sseq@xycoord)}% - \edef\sseq@rawindex{\sseq@obj{partcoord.(\sseq@xycoord).numnodes}}% or maybe I should break? + \edef\sseq@rawindex{\sseq@obj{partcoord.(\sseq@xycoord).numnodes}} + \sseq@fbreak \fi - \edef\sseq@index{\the\numexpr\sseq@rawindex} \fi }{ \sseq@error@xx{undefined-tag}{\sseq@rawindex}{(\sseq@xycoord)}% @@ -621,13 +638,21 @@ \def\sseq@index{}% \def\sseq@errortype{#3}% \sseq@parsecoord@maincoord{#2}% - \let\sseq@rawindex\sseq@restcoord + \exp_args:NNf\def\sseq@rawindex{\exp_args:No\sseq@trimspaces{\sseq@restcoord}} \ifx\sseq@index\pgfutil@empty \@xp\sseq@parsecoord@index \fi \sseq@parsecoord@setupvariables{#1}{#2} } +\newif\ifsseq@parsecoord@allownonexisting +\def\sseq@parsecoord@allownonexisting#1#2#3{% + \sseq@parsecoord@allownonexistingtrue + \sseq@parsecoord{#1}{#2}{#3} + \sseq@parsecoord@allownonexistingfalse +} + + \def\sseq@parsecoord@setupvariables#1#2{ % TODO: clean this up a bit? it's pretty ad-hoc. % Whenever you update this, make sure to update sseq@paredcoords@swap below too. @@ -807,11 +832,26 @@ \def\sseq@parsecoordex{\exp_last_unbraced:NNNf\sseq@parsecoordex@} \def\sseq@parsecoordex@#1(#2){\sseq@parsecoordex@@#1#2,\@nil} + +% Older versions of etex don't provide \expanded so need more expensive version of \exp_args:NNof. +\ifx\expanded\undefined + \cs_set:Npn\exp_args:NNof { \::N \::o \::f \::: } +\else + \cs_set:Npn\exp_args:NNof #1#2#3#4 { + \expanded { + \exp_not:N #1 + \exp_not:N #2 + { \unexpanded \expandafter { #3 } } + { \unexpanded \expandafter { \exp:w \exp_end_continue_f:w #4} } + } + } +\fi + \def\sseq@parsecoordex@@#1#2,#3,#4\@nil{ \ifx& - \exp_last_unbraced:NNo\sseq@parsecoord@indexex#1(\the\numexpr#2\@xp,\the\numexpr#3,1) + \exp_args:NNo\sseq@parsecoord@indexex#1{\the\numexpr#2\@xp,\the\numexpr#3}{1} \else - \exp_args:NNo\sseq@parsecoord@indexex#1{\the\numexpr#2\@xp,\the\numexpr#3\@xp\relax\@xp}\@xp{\sseq@removecomma#4\sseq@nil} + \exp_args:NNof\sseq@parsecoord@indexex#1{\the\numexpr#2\@xp,\the\numexpr#3\@xp\relax}{\exp_args:Nf\sseq@trimspaces{\sseq@removecomma#4\sseq@nil}} \fi } @@ -863,8 +903,9 @@ \protected\def\sseq@pushstack(#1){ \bgroup - \sseq@parsecoord\temp{#1}{} + \sseq@parsecoord@allownonexisting\temp{#1}{} \sseq@pushstack@\temp + \sseq@breakpoint \egroup } @@ -872,6 +913,7 @@ \def\sseq@pushstack@{\@xp\sseq@pushstack@@} \def\sseq@pushstack@@(#1,#2,#3){ + %\def\temp{#1,#2,#3}\show\temp \global\advance\sseq@stackdepth\@ne \@xp\gdef\csname sseq.\sseq@thename.stack.\the\sseq@stackdepth.lastx\endcsname{#1} \@xp\gdef\csname sseq.\sseq@thename.stack.\the\sseq@stackdepth.lasty\endcsname{#2} @@ -1000,7 +1042,7 @@ \sseq@parsecoord\coord{#1}{} \@gobbletwo\sseq@breakpoint\sseq@tempiffalse % this executes \sseq@tempiffalse if we broke, otherwise it gets gobbled \ifsseq@tempif - \sseq_if_out_of_bounds_noparse:nnTF { \xcoord } { \ycoord }{\egroup\prg_return_true:}{\egroup\prg_return_false:} + \sseq_if_out_of_bounds_inner:nnTF { \xcoord } { \ycoord }{\egroup\prg_return_true:}{\egroup\prg_return_false:} \else \egroup \prg_return_false: @@ -1008,16 +1050,24 @@ } % For internal use b/c it's faster not to call \sseq@parsecoord +% Make sure to add \sseq@x and \sseq@y to the coordinate before passing along +% to if_out_of_bounds_inner to correctly account for translations. \prg_new_conditional:Npnn \sseq_if_out_of_bounds_noparse:nn #1#2 {TF} { - \sseq@tempiftrue - \ifnum#1<\sseq@xmaxpp\relax\ifnum#1>\sseq@xminmm\relax\ifnum#2<\sseq@ymaxpp\relax\ifnum#2>\sseq@yminmm\relax - \sseq@tempiffalse - \fi\fi\fi\fi - \ifsseq@tempif - \prg_return_true: - \else - \prg_return_false: - \fi + \sseq_if_out_of_bounds_inner:nnTF { #1 + \sseq@x } { #2 + \sseq@y } + { \prg_return_true: } + { \prg_return_false: } +} + + +\prg_new_conditional:Npnn \sseq_if_out_of_bounds_inner:nn #1#2 {TF} { + \bool_lazy_all:nTF { + { \int_compare_p:nNn { #1 } < { \sseq@xmaxpp } } + { \int_compare_p:nNn { #1 } > { \sseq@xminmm } } + { \int_compare_p:nNn { #2 } < { \sseq@ymaxpp } } + { \int_compare_p:nNn { #2 } > { \sseq@yminmm } } + } + { \prg_return_false: } + { \prg_return_true: } } \prg_new_conditional:Npnn \sseq_if_alive:nn #1 #2 { T, F, TF } { @@ -1178,6 +1228,9 @@ \futurelet\testtok\sseq@defer@tikzcommand@@ } +% This serves as a marker to break out of parser. +% TODO: support \pgfextra? Should we pass \pgfextra along to be handled by tikz parser? +\def\sseq@defer@tikzcommand@escape{sseq@defer@tikzcommand@escape} \def\sseq@defer@tikzcommand@@{% \ifx\testtok; \let\next\sseq@defer@tikzcommand@finish @@ -1191,10 +1244,19 @@ \@xp\ifx\space\testtok \let\next\sseq@defer@tikzcommand@space \else - \ifx\testtok\bgroup - \let\next\sseq@defer@tikzcommand@group + % TODO: also support "foreach" keyword without the backslash. + \ifx\testtok\foreach + \let\next\sseq@defer@tikzcommand@foreach \else - \let\next\sseq@defer@tikzcommand@other + \ifx\testtok\sseq@defer@tikzcommand@escape % escape is like \pgfextra, breaks out of the parsing. + \let\next\@gobble + \else + \ifx\testtok\bgroup + \let\next\sseq@defer@tikzcommand@group + \else + \let\next\sseq@defer@tikzcommand@other + \fi + \fi \fi \fi \fi @@ -1204,6 +1266,12 @@ } +\def\sseq@defer@tikzcommand@foreach{ + \def\pgffor@beginhook{\expandafter\sseq@defer@tikzcommand@\pgfutil@firstofone} + \def\pgffor@endhook{\sseq@defer@tikzcommand@escape} + \def\pgffor@afterhook{\sseq@defer@tikzcommand@} +} + \def\sseq@defer@tikzcommand@option[#1]{% \sseq@processoptions{tikz ~ primitives}{#1}% \ifx\sseq@savedoptioncode\pgfutil@empty\else @@ -1301,8 +1369,10 @@ % If the expression was incomplete, we'll jump here to avoid adding the semicolon to the error printout \def\sseq@defer@tikzcommand@finish@{ \sseq@g@addto@macro\sseq@thepathsofar{;} + %\show\sseq@thepathsofar \global\sseq@thiscalltoks\@xp{\sseq@whattheusersaid} \ifx\sseq@pageconstraint\sseq@pageconstraint@true + %\show\sseq@thepathsofar \sseq@savedpaths@xaddtikzpath{\unexpanded\@xp{\sseq@thepathsofar}}% \else \sseq@savedpaths@xaddtikzpath{% @@ -1371,7 +1441,7 @@ \fi \ifsseq@tempif \@xp\sseq@tikzprimitives@ifintcoords\@xp{\sseq@tempcoord}{ % check we're all integer coordinates - \sseq@parsecoord\coord{\sseq@tempcoord}{tikz ~ primitive}% + \sseq@parsecoord@allownonexisting\coord{\sseq@tempcoord}{tikz ~ primitive}% \ifx\sseq@index\pgfutil@empty\else \sseq@x@addto@macro\sseq@thepathsofar{(sseq{\sseq@removeparens\coord}\sseq@tempanchor)}% Okay, we're all set, it's a class \let\next\@gobble % don't run \sseq@tikzprimitives@notaclass |