diff --git a/Doc/FFCatalog/FFCatalog.pdf b/Doc/FFCatalog/FFCatalog.pdf
index f2af9db1bff272d4c6d7f81042e4518bbec2b476..3a86fdb4be487ef50fffea5a9d062471dbebc51d 100644
Binary files a/Doc/FFCatalog/FFCatalog.pdf and b/Doc/FFCatalog/FFCatalog.pdf differ
diff --git a/Doc/FFCatalog/FormFactors.tex b/Doc/FFCatalog/FormFactors.tex
index 46e58287650ced17cfe5c7f94e18cea0c870ef45..e781094b04295d2a473aa2855c072bd9a1616004 100644
--- a/Doc/FFCatalog/FormFactors.tex
+++ b/Doc/FFCatalog/FormFactors.tex
@@ -242,9 +242,9 @@ Shape&Name&Symmetry&Parameters&Reference\\\hline
%===============================================================================
\ffsection{AnisoPyramid (rectangle-based)} \label{SAnisoPyramid}
%===============================================================================
- \index{Anisotropic pyramid (form factor)}
- \index{Pyramid (form factor)!rectangular (AnisoPyramid)}
- \index{Truncated pyramid (form factor)!rectangular (AnisoPyramid)}
+ \index{Anisotropic pyramid}
+ \index{Pyramid!rectangular (AnisoPyramid)}
+ \index{Truncated pyramid!rectangular (AnisoPyramid)}
\index{FormFactorAnisoPyramid@\Code{FormFactorAnisoPyramid}}
\paragraph{Real-space geometry}\strut\\
@@ -313,9 +313,9 @@ and were found to fully agree.
%===============================================================================
\ffsection{Box (cuboid)} \label{SBox}
%===============================================================================
- \index{Box (form factor)}
- \index{Cuboid (form factor)}
- \index{Prism (form factor)!reactangular (Box)}
+ \index{Box}
+ \index{Cuboid}
+ \index{Prism!reactangular (Box)}
\index{Platonic solid!cube}
\index{FormFactorBox@\Code{FormFactorBox}}
@@ -378,8 +378,8 @@ except for factors $1/2$ in the definitions of parameters $L$, $W$, $H$.
%===============================================================================
\ffsection{Cone (circular)} \label{SCone}
%===============================================================================
- \index{Cone (form factor)!circular}
- \index{Truncated cone (form factor)}
+ \index{Cone!circular}
+ \index{Truncated cone}
\index{FormFactorCone@\Code{FormFactorCone}}
\paragraph{Real-space geometry}\strut\\
@@ -452,9 +452,9 @@ in \cref{SCylinder}.
%===============================================================================
\ffsection{Cone6 (hexagonal)} \label{SCone6}
%===============================================================================
- \index{Cone (form factor)!hexagonal (Cone6)}
- \index{Pyramid (form factor)!hexagonal (Cone6)}
- \index{Truncated pyramid (form factor)!hexagonal (Cone6)}
+ \index{Cone!hexagonal (Cone6)}
+ \index{Pyramid!hexagonal (Cone6)}
+ \index{Truncated pyramid!hexagonal (Cone6)}
\index{FormFactorCone6@\Code{FormFactorCone6}}
\paragraph{Real-space geometry}\strut\\
@@ -524,7 +524,7 @@ with series expansions near singularities.
%===============================================================================
\ffsection{Cuboctahedron} \label{SCuboctahedron}
%===============================================================================
- \index{Cuboctahedron (form factor)}
+ \index{Cuboctahedron}
\index{Platonic solid!octahedron}
\index{FormFactorCuboctahedron@\Code{FormFactorCuboctahedron}}
@@ -598,7 +598,7 @@ using the generic polyhedron form factor \cite{Wut17}.
%===============================================================================
\ffsection{Cylinder} \label{SCylinder}
%===============================================================================
- \index{Cylinder (form factor)}
+ \index{Cylinder}
\index{FormFactorCylinder@\Code{FormFactorCylinder}}
\paragraph{Real-space geometry}\strut\\
@@ -691,7 +691,7 @@ use $t J_0(t)= \d[t J_1(t)]/\d t$ \cite[Formula~9.1.30a]{AbSt64}.
%===============================================================================
\ffsection{Dodecahedron} \label{SDodecahedron}
%===============================================================================
- \index{Dodecahedron (form factor)}
+ \index{Dodecahedron}
\index{Platonic solid!dodecahedron}
\index{FormFactorDodecahedron@\Code{FormFactorDodecahedron}}
@@ -766,8 +766,8 @@ based on the generic form factor of the polyhedron~\cite{Wut17}.
%===============================================================================
\ffsection{EllipsoidalCylinder} \label{SEllipsoidalCylinder}
%===============================================================================
- \index{Ellipsoidal cylinder (form factor)}
- \index{Cylinder (form factor)!ellipsoidal}
+ \index{Ellipsoidal cylinder}
+ \index{Cylinder!ellipsoidal}
\index{FormFactorEllipsoidalCylinder@\Code{FormFactorEllipsoidalCylinder}}
\paragraph{Real-space geometry}\strut\\
@@ -831,9 +831,9 @@ or \E{Ellipsoidal Cylinder} \cite[Eq.~224]{ReLL09}.
%===============================================================================
\ffsection{FullSphere} \label{SFullSphere}
%===============================================================================
- \index{Ball (form factor)|see {Sphere}}
- \index{Full sphere (form factor)}
- \index{Sphere (form factor)}
+ \index{Ball|see {Sphere}}
+ \index{Full sphere}
+ \index{Sphere}
\index{FormFactorFullSphere@\Code{FormFactorFullSphere}}
\paragraph{Real-space geometry}\strut\\
@@ -963,8 +963,8 @@ which is what we wanted to prove.
%===============================================================================
\ffsection{FullSpheroid} \label{SFullSpheroid}
%===============================================================================
- \index{Full spheroid (form factor)}
- \index{Spheroid (form factor)}
+ \index{Full spheroid}
+ \index{Spheroid}
\index{FormFactorFullSpheroid@\Code{FormFactorFullSpheroid}}
\paragraph{Real-space geometry}\strut\\
@@ -1040,9 +1040,9 @@ the transformation matrix is just $M=\text{diag}(1/R, 1/R, 1/h)$.
%===============================================================================
\ffsection{HemiEllipsoid} \label{SHemiEllipsoid}
%===============================================================================
- \index{Hemi ellipsoid (form factor)}
- \index{Ellipsoid (form factor)!truncated}
- \index{Truncated ellipsoid (form factor)}
+ \index{Hemi ellipsoid}
+ \index{Ellipsoid!truncated}
+ \index{Truncated ellipsoid}
\index{FormFactorHemiEllipsoid@\Code{FormFactorHemiEllipsoid}}
\paragraph{Real-space geometry}\strut\\
@@ -1109,7 +1109,7 @@ or \E{Hemi-spheroid} \cite[Eq.~229]{ReLL09}.
%===============================================================================
\ffsection{Icosahedron} \label{SIcosahedron}
%===============================================================================
- \index{Icosahedron (form factor)}
+ \index{Icosahedron}
\index{Platonic solid!icosahedron}
\index{FormFactorIcosahedron@\Code{FormFactorIcosahedron}}
@@ -1184,7 +1184,7 @@ based on the generic form factor of the polyhedron~\cite{Wut17}.
%===============================================================================
\ffsection{Prism3 (triangular)} \label{SPrism3}
%===============================================================================
- \index{Prism (form factor)!triangular (Prism3)}
+ \index{Prism!triangular (Prism3)}
\index{FormFactorPrism3@\Code{FormFactorPrism3}}
\paragraph{Real-space geometry}\strut\\
@@ -1253,7 +1253,7 @@ to achieve numerical stability near the removable singularity at $q\to0$.
%===============================================================================
\ffsection{Prism6 (hexagonal)} \label{SPrism6}
%===============================================================================
- \index{Prism (form factor)!hexagonal (Prism6)}
+ \index{Prism!hexagonal (Prism6)}
\index{FormFactorPrism6@\Code{FormFactorPrism6}}
\paragraph{Real-space geometry}\strut\\
@@ -1321,8 +1321,8 @@ to achieve numerical stability near the removable singularity at $q\to0$.
%===============================================================================
\ffsection{Pyramid (square-based)}\label{SPyramid}
%===============================================================================
- \index{Pyramid (form factor)!square}
- \index{Truncated pyramid (form factor)!square}
+ \index{Pyramid!square}
+ \index{Truncated pyramid!square}
\index{FormFactorPyramid@\Code{FormFactorPyramid}}
\paragraph{Real-space geometry}\strut\\
@@ -1392,8 +1392,8 @@ to achieve numerical stability near the removable singularity at $q\to0$.
%===============================================================================
\ffsection{Tetrahedron} \label{STetrahedron}
%===============================================================================
- \index{Tetrahedron (form factor)}
- \index{Truncated tetrahedron (form factor)}
+ \index{Tetrahedron}
+ \index{Truncated tetrahedron}
\index{Platonic solid!tetrahedron}
\index{FormFactorTetrahedron@\Code{FormFactorTetrahedron}}
@@ -1472,8 +1472,8 @@ with series expansions near singularities.
%===============================================================================
\ffsection{TruncatedCube} \label{STruncatedCube}
%===============================================================================
- \index{Cube (form factor)!facetted}
- \index{Facetted cube (form factor)}
+ \index{Cube!facetted}
+ \index{Facetted cube}
\index{FormFactorTruncatedCube@\Code{FormFactorTruncatedCube}}
\paragraph{Real-space geometry}\strut\\
@@ -1538,9 +1538,9 @@ of a polygonal prism \cite{Wut17}.
%===============================================================================
\ffsection{TruncatedSphere}\label{STruncatedSphere}
%===============================================================================
- \index{Sphere (form factor)!segment|see{truncated}}
- \index{Sphere (form factor)!truncated}
- \index{Truncated sphere (form factor)}
+ \index{Sphere!segment|see{truncated}}
+ \index{Sphere!truncated}
+ \index{Truncated sphere}
\index{FormFactorTruncatedSphere@\Code{FormFactorTruncatedSphere}}
\index{Segment (spherical)}
@@ -1580,7 +1580,7 @@ They must fulfill
\paragraph{Special cases}\strut\\
\index{Cap (spherical)}
- \index{Sphere (form factor)!cap}
+ \index{Sphere!cap}
A \E{spherical cap} is obtained from a spherical ball by a single cut.
This is covered by the following special parameterization of \texttt{TruncatedSphere}:
\begin{itemize}
@@ -1631,8 +1631,8 @@ in \cref{SCylinder}.
%===============================================================================
\ffsection{TruncatedSpheroid} \label{STruncatedSpheroid}
%===============================================================================
- \index{Spheroid (form factor)!truncated}
- \index{Truncated spheroid (form factor)}
+ \index{Spheroid!truncated}
+ \index{Truncated spheroid}
\index{FormFactorTruncatedSpheroid@\Code{FormFactorTruncatedSpheroid}}
\paragraph{Real-space geometry}\strut\\
@@ -1719,8 +1719,8 @@ in \cref{SCylinder}.
%===============================================================================
\ffsection{Ripple1 (sinusoidal)} \label{SRipple1}
%===============================================================================
- \index{Ripple (form factor)!sinusoidal (Ripple1)}
- \index{Sinusoidal ripple (form factor)}
+ \index{Ripple!sinusoidal (Ripple1)}
+ \index{Sinusoidal ripple}
\index{FormFactorRipple1@\Code{FormFactorRipple1}}
\paragraph{Real-space geometry}\strut\\
@@ -1790,8 +1790,8 @@ Agrees with the \E{Ripple1} form factor of \FitGISAXS\ \cite{Bab13}.
%===============================================================================
\ffsection{Ripple2 (saw-tooth)} \label{SRipple2}
%===============================================================================
- \index{Ripple (form factor)!saw-tooth (Ripple2)}
- \index{Saw-tooth ripple (form factor)}
+ \index{Ripple!saw-tooth (Ripple2)}
+ \index{Saw-tooth ripple}
\index{FormFactorRipple2@\Code{FormFactorRipple2}}
\paragraph{Real-space geometry}\strut\\