quantikz (11sep18)

git-svn-id: svn://tug.org/texlive/trunk@48645 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 1331 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/latex/quantikz/README.md b/Master/texmf-dist/doc/latex/quantikz/README.md
new file mode 100644
index 00000000000..bd869cdbebd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/quantikz/README.md
@@ -0,0 +1,7 @@
+#Quantikz#
+
+The package is quantikz, written by Alastair Kay. Its purpose is to extend tikz with the functionality for drawing quantum circuit diagrams.
+
+It is covered by a CC-BY 4.0 license.
+
+Please see the manual for detailed usage.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/quantikz/manual.pdf b/Master/texmf-dist/doc/latex/quantikz/manual.pdf
new file mode 100644
index 00000000000..e68eaa2b746
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/quantikz/manual.pdf
diff --git a/Master/texmf-dist/doc/latex/quantikz/manual.tex b/Master/texmf-dist/doc/latex/quantikz/manual.tex
new file mode 100644
index 00000000000..d89420f3bbb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/quantikz/manual.tex
@@ -0,0 +1,788 @@
+\documentclass[aps,pra,10pt,nofootinbib]{revtex4}
+%\pdfoutput=1
+% Package(s) to include
+%\listfiles
+\usepackage{amsfonts,amssymb,amsmath}            % for math symbols.
+\usepackage{lmodern,adjustbox}
+\usepackage[skins,breakable]{tcolorbox}
+\usepackage{tikz}
+\usetikzlibrary{quantikz}
+\tcbuselibrary{listings}
+\tcbuselibrary{breakable}
+\lstset{
+basicstyle=\small\ttfamily,
+columns=flexible,
+breaklines=true
+}
+\usepackage[pdftex,hyperfigures,pdfpagelabels]{hyperref} 
+%\lstloadlanguages{Latex}
+
+\newtcolorbox{Code}{enhanced,fonttitle=\sffamily\bfseries\large,valign=center
+,drop fuzzy shadow,sidebyside,lefthand ratio=0.4,lower separated=false}
+
+\begin{document}
+
+\title{Tutorial on the Quantikz Package}
+\date{\today}
+\author{Alastair \surname{Kay}}
+\affiliation{Royal Holloway University of London, Egham, Surrey, TW20 0EX, UK}
+\email{alastair.kay@rhul.ac.uk}
+\begin{abstract}
+\end{abstract}
+\maketitle
+I've always used \href{https://arxiv.org/abs/quant-ph/0406003}{QCircuit} for typesetting quantum circuit diagrams within \LaTeX, but found the Xy-pic based notation rather impenetrable and I struggled to adapt it for my needs (this is probably my failing rather than the package's). Thus, I wanted a tikz package that could do the same. That package is Quantikz. Those familiar with QCircuit will recognise much of the notation, although it has evolved a bit (hopefully simplified!).
+
+\section{Usage}
+
+There is not currently a package that lets you install Quantikz automatically. Instead, you need to obtain the file tikzlibraryquantikz.code.tex (it should accompany the source code of this file, and the most recent version will always be available \href{http://dx.doi.org/10.17637/rh.7000520}{here}.) and put it in the same folder as your main tex document. Then, in the preamble of your document, simply write
+\begin{verbatim}
+\usepackage{tikz}
+\usetikzlibrary{quantikz}
+\end{verbatim}
+Now, each time that you want to include a quantum circuit, you just enclose it in a \verb!tikzcd! environment.
+
+Once you start using this for multiple projects, it gets annoying to have to create a copy every time (but remember that you'll need to include a copy for arXiv/journal submission). It might be easier to create a local texmf branch that contains the relevant file in a sub-folder \verb!tex/latex/quantikz/!. If you use MikTeX, see here for \href{https://miktex.org/howto/miktex-console}{Registering a user-managed TEXMF root directory}. A range of variants can be found on \href{https://tex.stackexchange.com/questions/1137/where-do-i-place-my-own-sty-or-cls-files-to-make-them-available-to-all-my-te}{Stack Exchange}.
+\section{A Single Wire}
+%\expandafter\def\expandafter\mname\expandafter{\getrandomletter}
+Quantum circuits are laid out with a matrix notation, with cells separated by \& (just like all matrices, tables etc.\ in \LaTeX). Here, we typeset a single quantum wire.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+ & \phase{\alpha} & \gate{H} & \phase{\beta} & \gate{H} & \phase{\gamma} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \phase{\alpha} & \gate{H} & \phase{\beta} & \gate{H} & \phase{\gamma} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Single-qubit gates take the form \verb!\gate{H}!, with any sequence of maths allowed in the argument, or, for phase gates, \verb!\phase{phase}!. The first gate should be in the second column rather than the first (so that the preceding quantum wire has somewhere to go). You {\em can} put it in the first column, it just won't have an incoming wire. 
+
+Text can be added at the start of a quantum wire using \verb!\lstick{}!, and at the end using \verb!\rstick{}!. These are not maths environments.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}$} & \phase{\alpha} & \gate{H} & \phase{\beta} & \gate{H} & \phase{\gamma} & \rstick{Arbitrary\\pure state}\qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{\ket{0}} & \phase{\alpha} & \gate{H} & \phase{\beta} & \gate{H} & \phase{\gamma} & \rstick{Arbitrary\\pure state}\qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Notice that a multi-line \verb!lstick! or \verb!rstick! is trivial\footnote{The only issue is that the height of the label will not be taken into account in the vertical spacing of quantum wires. You may have to adjust this manually. See Section \ref{sec:align} for an example of how to achieve this.}.
+
+\subsection{Measurements}
+
+There are several measurement devices to choose from, and the measurement basis can be specified as the parameter:
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \meter{0} && \meterD{1} & & \measuretab{\text{out}}& & \measure{\text{basis}}
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \meter{0} && \meterD{1} && \measuretab{\text{out}} && \measure{\text{basis}}
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Thus, in our previous circuit:
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}$} & \phase{\alpha} & \gate{H} & \phase{\beta} & \gate{H} & \phase{\gamma} & \meter{\ket{\pm}}
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{\ket{0}} & \phase{\alpha} & \gate{H} & \phase{\beta} & \gate{H} & \phase{\gamma} & \meter{\ket{\pm}}
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\subsection{Wires and Arrows}
+
+There are a few bells and whistles: \verb!\qw! connects a quantum wire from the current cell back to the previous one. Most gates have this built in (\verb!\rstick! is the notable exception). Equally, sometimes you want a `do nothing' operation, and \verb!\qw! is perfect for that. Also, you can just insert text into a cell without boxing it (as you would for a gate). This can be useful for errors, and is achieved with \verb!\push{}!. 
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}$\\initial state} & \qw & \push{X} & \qw & \rstick{$\ket{1}$} \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{$\ket{0}$\\initial state} & \qw & \push{X} & \qw & \rstick{$\ket{1}$} \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Since we have built quantikz on top of tikzcd, any of the standard arrow commands will work. For example, after a measurement, you might what to use an arrow to report a particular measurement outcome using \verb!\arrow[r]!. The \verb!r! conveys that the arrow should head one cell to the right. You can use combinations of up (u), down (d), left (l) and right as you wish. For more styling options, see the \href{http://mirrors.ctan.org/graphics/pgf/contrib/tikz-cd/tikz-cd-doc.pdf}{tikzcd manual}.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}$\\initial state} & \qw & \push{X} & \qw & \meter{0/1} \arrow[r] & \rstick{\ket{1}}
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{$\ket{0}$\\initial state} & \qw & \push{X} & \qw & \meter{0/1} \arrow[r] & \rstick{\ket{1}}
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+Sometimes, you may want to group a whole bunch of wires together. Use \verb!\qwbundle! instead of \verb!\qw!.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}^{\otimes n}$} &[2mm] \gate{H}\qwbundle &  \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{$\ket{0}^{\otimes n}$} &[2mm] \gate{H} \qwbundle& \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+The size of the strike can be altered by doing \verb!\pgfkeyssetvalue{/quantikz/Strike Height}{new height}! and \verb!\pgfkeyssetvalue{/quantikz/Strike Width}{new width}!. To adjust the spacing, you'll need to alter the column spacing. This can be done either globally (see later for usage of \verb!row sep! which is similar to the \verb!column sep! you'd need), or on a column by column basis, as done in the previous example with the \verb![2mm]! statement, adding 2mm of horizontal space between two columns.
+
+You can access an alternative form for the multi-qubit wire using the \verb!alternate! key
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}^{\otimes n}$} & \gate{H} \qwbundle[alternate]&  \qwbundle[alternate] 
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{$\ket{0}^{\otimes n}$} & \gate{H} \qwbundle[alternate]& \control\qwbundle[alternate] 
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\section{Multiple Qubits}
+
+New rows are started with \textbackslash\textbackslash. If the wires don't interact, then you proceed exactly as before. Naturally, there are several gates that induce interaction between wires: \verb!\ctrl{3}! makes a control-qubit (for controlled-not, controlled-phase, controlled-$U$, etc), where the target is 3 wires below. \verb!\octrl! is near-identical, except the control circle is open, as usually used to convey being controlled off $\ket{0}$ instead of $\ket{1}$. These will need to be matched with target commands. These could be normal gates or \verb!\targ{}! (controlled-not), \verb!\control{}! (controlled-phase), \verb!\ocontrol{}! (controlled-phase, controlled off $\ket{0}$). There is also a swap gate, \verb!\swap{2}!, with target \verb!\targX{}!. These can be combined to qive multi-controlled gates.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick{$\ket{0}$} & \gate{H} & \ctrl{1} & \gate{U} & \ctrl{1} & \swap{2} & \ctrl{1} & \qw  \\
+\lstick{$\ket{0}$} & \gate{H} & \targ{} & \octrl{-1} & \control{} & \qw & \octrl{1} & \qw \\
+&&&&&\targX{} & \gate{U} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick{$\ket{0}$} & \gate{H} & \ctrl{1} & \gate{U} & \ctrl{1} & \swap{2} & \ctrl{1} & \qw  \\
+\lstick{$\ket{0}$} & \gate{H} & \targ{} & \octrl{-1} & \control{} & \qw & \octrl{1} & \qw \\
+&&&&&\targX{} & \gate{U} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+If you want a gate that is one control and several targets, you need the command \verb!\vqw{1}! (vertical quantum wire) to create vertical connections, or possibly \verb!\vcw{1}! to create the classical version.
+
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \targ{} & \gate{U} & \qw \\
+& \ctrl{1} \vqw{-1} & \meter{} \vcw{-1} \\
+& \targ{} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \targ{} & \gate{U} & \qw \\
+& \ctrl{1} \vqw{-1} & \meter{} \vcw{-1} \\
+& \targ{} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+If you want to use classical controls with both horizontal and vertical components, you can do the following.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \ctrl{1} & \qw & \gate{U} & \gate{V} \\
+& \targ{} \vqw{1} & \meter{} & \cwbend{-1}  \\
+& \targ{} & \meter{} & \cw & \cwbend{-2} &
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \ctrl{1} & \qw & \gate{U} & \gate{V} \\
+& \targ{} \vqw{1} & \meter{} & \cwbend{-1} \\
+& \targ{} & \meter{} & \cw & \cwbend{-2} &
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\section{Operating on Many Qubits}
+
+We have already met the \verb!\lstick!, \verb!\rstick!, and \verb!\gate! commands. By default, these all act on a single quantum wire. However, they also take the optional parameter \verb!wires=n! to specify that they should extend over $n$ wires. The syntax is otherwise unchanged.
+
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+\lstick[wires=3]{$\ket{0}^{\otimes 3}$} & \ctrl{1} & \meter{} \\
+ & \gate[wires=2]{U} & \qw\rstick[wires=2]{\ket{11}} \\ %
+ &  & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+\lstick[wires=3]{$\ket{0}^{\otimes 3}$} & \ctrl{1} & \meter{} \\
+ & \gate[wires=2]{U} & \qw\rstick[wires=2]{\ket{11}} \\ %
+ &  & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+If you want to add extra width on the \verb!\gate!, you can either alter the text by adding spaces either side, or you could use an \verb!\hphantom! command in one of the underlying cells.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1} & \meter{} \\
+& \gate[wires=2]{U}  & \targ{} & \qw \\
+& \hphantom{wide label} & \qw & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1} & \meter{} \\
+& \gate[wires=2]{U}  & \targ{} & \qw \\
+& \hphantom{wide label} & \qw & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Often, it is nice to be able to label the inputs and outputs on the box, which we do with the \verb!\gateinput! and \verb!\gateoutput! commands. These commands take 1 compulsory argument -- the label text. By default, this applies to a single wire, but you can again use the optional \verb!wires! parameter to extend it. The starting point is determined by where the command is placed.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+&\ctrl{1} & \qw \\
+&\gate[wires=3]{U}
+	\gateinput[wires=2]{$x$}
+	\gateoutput[wires=2]{$x$}
+	&\qw \\
+&\hphantom{U very long} & \qw \\
+&\gateinput{$y$}
+\gateoutput{$y\oplus f(x)$}
+&\qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+&\ctrl{1} & \qw \\
+&\gate[wires=3]{U}
+	\gateinput[2]{$x$}
+	\gateoutput[wires=2]{$x$}&\qw \\
+&\hphantom{U very long} \qw & \qw \\
+&\qw\gateinput{$y$}\gateoutput{$y\oplus f(x)$}&\qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\section{Slicing}
+
+It is often helpful to `slice' up a circuit for the sake of explaining it step by step. To do this, we provide the \verb!\slice{title}! command, which inserts a dashed vertical line after the column in which the command is added.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H}\slice{step}  & \ctrl{1} & \meter{} \\
+& \qw       & \targ{} & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \qw & \targ{} & \qw & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H}\slice{step}  & \ctrl{1} & \meter{} \\
+& \qw       & \targ{} & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \qw & \targ{} & \qw & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+You can also slice every step by using option \verb!slice all!, and the labels will be automatically numbered. This is likely to behave strangely unless you explicitly ensure that all rows have the same number of entries (i.e.\ short rows should have extra \& characters added).
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[slice all]
+& \gate{H} & \ctrl{1} & \meter{} && \\
+& \qw       & \targ{} & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \qw & \targ{} & \qw & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[slice all]
+& \gate{H}  & \ctrl{1} & \meter{} && \\
+& \qw       & \targ{} & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \qw & \targ{} & \qw & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+If you need to adjust where the last slice is, use the optional parameter \verb!remove end slices!, which counts the number of columns fewer to add slices to. You can also change the title of each of the slices, by setting \verb!slice titles!. Include the macro \verb!\col! in your specification if you want to use the step number. Note, however, that the columns won't space themselves out to accommodate a very wide label. You can style the slicing lines with the \verb!slice style! key, and the labels with \verb!slice label style!. These can be used to rotate the labels and create a bit more space!
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[slice all,remove end slices=1,slice titles=slice \col,slice style=blue,slice label style={inner sep=1pt,anchor=south west,rotate=40}]
+& \gate{H} & \ctrl{1} & \meter{} && \\
+& \qw       & \targ{} & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \qw & \targ{} & \qw & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[slice all,remove end slices=1,slice titles=slice \col,slice style=blue,slice label style={inner sep=1pt,anchor=south west,rotate=40}]
+& \gate{H}  & \ctrl{1} & \meter{} && \\
+& \qw       & \targ{} & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \qw & \targ{} & \qw & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+\noindent If you get compile errors when trying to slice, check the last line of your matrix, and make sure it doesn't end in \textbackslash\textbackslash.
+
+\section{Typesetting}
+
+\subsection{Alignment}\label{sec:align}
+
+How do we centre a circuit diagram? Simply surround it with \verb!\begin{center}! and \verb!\end{center}! commands, or within any standard equation environment.
+
+Vertical alignment between different circuits can be more fiddly, depending on how much of a perfectionist you are. Sometimes, they work immediately:
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{X} & \ctrl{1} & \qw \\
+& \qw & \targ{} & \qw
+\end{tikzcd}
+=\begin{tikzcd}
+& \ctrl{1} & \gate{X} & \qw \\
+& \targ{}  & \gate{X} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{X} & \ctrl{1} & \qw \\
+& \qw & \targ{} & \qw
+\end{tikzcd}
+=\begin{tikzcd}
+& \ctrl{1} & \gate{X} & \qw \\
+& \targ{}  & \gate{X} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+\noindent but the wires don't always align perfectly with each other. Ensuring an even spacing between rows can help (but is not always appropriate). See Sec.\ \ref{sec:space}.
+
+You might be better off writing it as a single quantum circuit with no wires joining the two parts. The spacing works better if your circuit has an odd number of wires, otherwise you have to add an extra row in the middle, and then change the spacing of that row with its neighbours.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \qw & \ctrl{2} & \qw&&& \ctrl{2} & \gate{Z} & \qw \\[-0.3cm]
+&&&&=&\\[-0.3cm]
+& \gate{Z} & \targ{} & \qw&&& \targ{}  & \gate{Z} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \qw & \ctrl{2} & \qw&&& \ctrl{2} & \gate{Z} & \qw \\[-0.3cm]
+&&&&=&\\[-0.3cm]
+& \gate{Z} & \targ{} & \qw&&& \targ{}  & \gate{Z} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+
+
+\subsection{Scaling}
+If you want to override the standard size of a circuit, you can make it a node inside a \verb!tikzpicture!:
+\begin{Code}
+\begin{center}
+\begin{tikzpicture}
+\node[scale=2] {
+\begin{tikzcd}
+& \gate{H} & \phase{\beta} & \gate{H} & \qw
+\end{tikzcd}
+};
+\end{tikzpicture}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzpicture}
+\node[scale=2] {
+\begin{tikzcd}
+& \gate{H} & \phase{\beta} & \gate{H} & \qw
+\end{tikzcd}
+};
+\end{tikzpicture}
+\end{lstlisting}
+\end{Code}
+It's also possible to rescale to a fixed width, so long as you declare the \verb!adjustbox! package in the document preamble.
+\begin{Code}
+\begin{center}
+\begin{adjustbox}{width=0.8\textwidth}
+\begin{tikzcd}
+& \gate{H} & \phase{\beta} & \gate{H} & \qw
+\end{tikzcd}
+\end{adjustbox}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{adjustbox}{width=0.8\textwidth}
+\begin{tikzcd}
+& \gate{H} & \phase{\beta} & \gate{H} & \qw
+\end{tikzcd}
+\end{adjustbox}
+\end{lstlisting}
+\end{Code}
+
+\subsection{Spacing}\label{sec:space}
+If you wish, it is possible to adjust spacing in the circuits using standard tikz commands. For example, a ridiculous horizontal spacing:
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[column sep=1cm]
+& \gate{H} & \phase{\beta} & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[row sep=0.5cm,column sep=1cm]
+& \gate{H} & \phase{\beta} & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+For horizontal spacing of an individual column, use \verb!\hphantom{}! if it's a place where there's already a gate, or there shouldn't be a quantum wire. If there's only a quantum wire, use \verb!\hphantomgate{}!. For spacing of an individual row, see the example on typesetting equation identities in Sec.\ \ref{sec:align}.
+
+Depending on what gates you have on each wire, the spacing may not be the same between each wire. Sometimes this is desirable, particularly if a gate in one particular row is much larger than anything in the other rows. At other times, it just makes your diagram look a little odd. If you want to make sure that every quantum wire is equally spaced, do the following to \verb!row sep!:
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[row sep={1cm,between origins}]
+\lstick[wires=3]{$\ket{0}^{\otimes n}$} & \gate{H} & \gate[wires=4]{O}\gateinput[wires=3]{$x$}
+\gateoutput[wires=3]{$x$} & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+\lstick{$\ket{1}$} & \gate{H} & \phantom{really wide}\gateinput{$y$}\gateoutput{$y\oplus f(x)$} & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[row sep={1cm,between origins}]
+\lstick[wires=3]{$\ket{0}^{\otimes n}$} & \gate{H} & \gate[wires=4]{O}\gateinput[wires=3]{$x$}
+\gateoutput[wires=3]{$x$} & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+\lstick{$\ket{1}$} & \gate{H} & \phantom{really wide}\gateinput{$y$}\gateoutput{$y\oplus f(x)$} & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Strictly, the \verb!wires=! statement should not be necessary, as this is presumed to be the default key. Thus, we can get the same results with
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[row sep={1cm,between origins}]
+\lstick[3]{$\ket{0}^{\otimes n}$} & \gate{H} & \gate[4]{O}\gateinput[3]{$x$}
+\gateoutput[3]{$x$} & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+\lstick{$\ket{1}$} & \gate{H} & \phantom{really wide}\gateinput{$y$}\gateoutput{$y\oplus f(x)$} & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[row sep={1cm,between origins}]
+\lstick[3]{$\ket{0}^{\otimes n}$} & \gate{H} & \gate[4]{O}\gateinput[3]{$x$}
+\gateoutput[3]{$x$} & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+ & \gate{H} &  & \gate{H} & \meter{}	\\
+\lstick{$\ket{1}$} & \gate{H} & \phantom{really wide}\gateinput{$y$}\gateoutput{$y\oplus f(x)$} & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\subsection{Global Styling}
+
+Global properties that affect all circuit elements of a given type can be affected through \verb!tikzset!.
+\begin{Code}
+\begin{center}
+\tikzset{
+	operator/.append style={fill=red!20},
+	my label/.append style={above right,xshift=0.3cm}
+}
+\begin{tikzcd}
+& \gate{H} & \phase{\beta} & \gate{H} & \qw & \meter{\ket{\pm}}
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\tikzset{
+	operator/.append style={fill=red!20},
+	my label/.append style={above right,xshift=0.3cm}
+}
+\begin{tikzcd}
+& \gate{H} & \phase{\beta} & \gate{H} & \qw & \meter{\ket{\pm}}
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+The global styles are:
+\begin{center}
+\begin{tabular}{c|c}
+Style Name & Affected Command(s)	\\
+\hline
+operator & \verb!\gate!	\\
+meter & \verb!\meter! \\
+slice & \verb!\slice! \\
+wave & \verb!\wave! \\
+leftinternal	& \verb!\gateinput! \\
+rightinternal	& \verb!\gateoutput! \\
+dm & left braces (\verb!\gateoutput!,\verb!\lstick!) \\
+dd & right braces (\verb!\gateinput!,\verb!\rstick!) \\
+phase & \verb!\phase!, \verb!\control! \\
+ophase & \verb!\ophase!, \verb!\ocontrol! \\
+circlewc & \verb!\targ! \\
+crossx2 & \verb!\swap!,\verb!\targX! \\
+my label & measurement bases in \verb!\meter! \\
+phase label & phases in \verb!\phase! \\
+gg label & main gate label in \verb!\gate! \\
+group label & label in \verb!\gategroup!
+\end{tabular}
+\end{center}
+
+\subsection{Per-Gate Styling}
+
+Individual gates can be modified using optional arguments of the calling function. 
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate[style={fill=red!20},label style=cyan]{H} & \phase[green]{\beta} & \gate{H} & \qw & \meter{\ket{\pm}}
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate[style={fill=red!20},label style=cyan]{H} & \phase[green]{\beta} & \gate{H} & \qw & \meter{\ket{\pm}}
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+The specific syntax varies a little depending on the type of gate
+\begin{center}
+\begin{tabular}{p{0.4\textwidth}|p{0.4\textwidth}}
+gates that don't accept formatting parameters & \verb!\qw!,\verb!\vqw!,\verb!\qwbundle!,\verb!\cw!,\verb!\vcw!,\verb!\cwbend!,\verb!\push!	\\
+\hline
+gates that accept tikz node formatting keys directly in optional argument & \verb!\phase!, \verb!\control!, \verb!\ocontrol!, \verb!\targ!, \verb!\targX!, \verb!\meter!, \verb!\meterD!, \verb!\measure!, \verb!\measuretab!, \verb!\wave! \\
+\hline
+gates that accept node formatting keys as \verb!label style! key in optional argument & \verb!\gate!, \verb!\slice!, \verb!\lstick!, \verb!\rstick!, \verb!\gategroup!, \verb!\gateinput!, \verb!\gateoutput!
+\end{tabular}
+\end{center}
+Those that accept the \verb!label style! key also accept a second key for formatting other elements of the display
+\begin{center}
+\begin{tabular}{c|cc}
+\verb!\gate!,\verb!\gategroup! & \verb!style! & styles the box	\\
+\verb!\slice! & \verb!style! & styles the line\\
+\verb!\lstick!,\verb!\rstick!,\verb!\gateinput!,\verb!\gateoutput! & \verb!braces! & styles the brace
+\end{tabular}
+\end{center}
+If you want to input several styling parameters with one of these keys, just group them together in a set of curly braces, \{\}. Typical styling parameters include \verb!draw=! specifying line colour, \verb!fill=!, specifying fill colour, \verb!inner xsep=! and \verb!inner ysep=! specifying horizontal and vertical margins respectively, \verb!xshift=! and \verb!yshift=! for adjusting horizontal and vertical positioning. Beyond that, the \href{http://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf}{tikz manual} is your friend!
+
+This styling is really quite flexible, as we can override the default shapes with anything that we want:
+\begin{Code}
+\begin{center}
+\tikzset{
+	group-1-5/.append style={starburst,fill=yellow,draw=red,line width=2pt,inner ysep=-15pt}
+}
+\begin{tikzcd}[row sep=0.3cm,column sep=0.4cm]%
+& \gate{H} & \ctrl{2}& \qw & \gate[3,style={starburst,fill=yellow,draw=red,line width=2pt,inner xsep=-2pt,inner ysep=-5pt},label style=cyan]{\text{noise}} & \ctrl{3} & \qw  & \qw & \qw\\
+\lstick{$\ket{0}$} & \qw & \targ{} & \qw & \qw & \qw & \ctrl{3} & \qw & \qw \\
+\lstick{$\ket{0}$} & \qw & \targ{}& \qw & \qw & \qw & \qw & \ctrl{2} & \qw\\
+&&&&\lstick{$\ket{0}$} & \targ{} & \targ{} & \qw & \meter{} \\
+&&&&\lstick{$\ket{0}$} & \qw & \targ{} & \targ{} & \meter{} 
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[row sep=0.3cm,column sep=0.4cm]%
+& \gate{H} & \ctrl{2}& \qw & \gate[3,style={starburst,fill=yellow,draw=red,line width=2pt,inner xsep=-2pt,inner ysep=-5pt},label style=cyan]{\text{noise}} & \ctrl{3} & \qw  & \qw& \qw\\
+\lstick{$\ket{0}$} & \qw & \targ{} & \qw & \qw & \qw & \ctrl{3} & \qw & \qw \\
+\lstick{$\ket{0}$} & \qw & \targ{}& \qw & \qw & \qw & \qw & \ctrl{2} & \qw\\
+&&&&\lstick{$\ket{0}$} & \targ{} & \targ{} & \qw & \meter{} \\
+&&&&\lstick{$\ket{0}$} & \qw & \targ{} & \targ{} & \meter{} 
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+We can also supplement with standard tikz commands by using the `execute at end picture' key. The cells of the matrix contain nodes called \verb!\tikzcdmatrixname-i-j!, where i is the row number and j is the column number. Thus,
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[row sep=0.3cm,column sep=0.4cm,execute at end picture={
+	\node [fit=(\tikzcdmatrixname-1-6)(\tikzcdmatrixname-4-6)(\tikzcdmatrixname-5-9),draw,dashed,inner sep=4pt,label={[yshift=0.3cm]above:syndrome extraction}] {};
+}]
+& \gate{H} & \ctrl{2}& \qw & \gate[3,style={starburst,fill=yellow,draw=red,line width=2pt,inner xsep=-2pt,inner ysep=-5pt}]{\text{noise}} & \ctrl{3} & \qw  & \qw& \qw\\
+\lstick{$\ket{0}$} & \qw & \targ{} & \qw & \qw & \qw & \ctrl{3} & \qw & \qw \\
+\lstick{$\ket{0}$} & \qw & \targ{}& \qw & \qw & \qw & \qw & \ctrl{2} & \qw\\
+&&&&\lstick{$\ket{0}$} & \targ{} & \targ{} & \qw & \meter{} \\
+&&&&\lstick{$\ket{0}$} & \qw & \targ{} & \targ{} & \meter{} 
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[row sep=0.3cm,column sep=0.4cm,execute at end picture={
+	\node [fit=(\tikzcdmatrixname-1-6)(\tikzcdmatrixname-4-6)(\tikzcdmatrixname-5-9),draw,dashed,inner sep=4pt,label={[yshift=0.3cm]above:syndrome extraction}] {};
+}]
+& \gate{H} & \ctrl{2}& \qw & \gate[3,style={starburst,fill=yellow,draw=red,line width=2pt,inner xsep=-2pt,inner ysep=-5pt}]{\text{noise}} & \ctrl{3} & \qw  & \qw& \qw\\
+\lstick{$\ket{0}$} & \qw & \targ{} & \qw & \qw & \qw & \ctrl{3} & \qw & \qw \\
+\lstick{$\ket{0}$} & \qw & \targ{}& \qw & \qw & \qw & \qw & \ctrl{2} & \qw\\
+&&&&\lstick{$\ket{0}$} & \targ{} & \targ{} & \qw & \meter{} \\
+&&&&\lstick{$\ket{0}$} & \qw & \targ{} & \targ{} & \meter{} 
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\subsection{Boxing/Highlighting Parts of a Circuit}
+
+In fact, this boxing command is sufficiently useful that we implement it as \verb!\gategroup!. The optional parameters \verb!wires! (again, the default) and \verb!steps! specify the number of rows and columns that the group spans respectively. The mandatory argument is the label for the box (although this can be empty). The top-left corner of the box coincides with the cell in which the command is placed.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1} & \gate{H}\gategroup[wires=2,steps=3,style={inner sep=6pt}]{reversed c-{\sc not}} & \ctrl{1} & \gate{H} & \ctrl{1} & \qw & \qw \\
+& \qw & \targ{} & \gate{H} & \targ{} & \gate{H} & \targ{} & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1} & \gate{H}\gategroup[wires=2,steps=3,style={inner sep=6pt}]{reversed c-{\sc not}} & \ctrl{1} & \gate{H} & \ctrl{1} & \qw & \qw \\
+& \qw & \targ{} & \gate{H} & \targ{} & \gate{H} & \targ{} & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+By default, this box is drawn on top of the circuit itself. If you want it to be behind (for example, should you want it to have a background colour), then use the \verb!background! option.
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1}\gategroup[2,steps=3,style={dashed,rounded corners,fill=blue!20, inner xsep=2pt},background]{{\sc swap}} & \targ{} & \ctrl{1} & \qw & \qw \\
+& \qw & \targ{} & \ctrl{-1} & \targ{} & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1}\gategroup[2,steps=3,style={dashed,rounded corners,fill=blue!20, inner xsep=2pt},background]{{\sc swap}} & \targ{} & \ctrl{1} & \qw & \qw \\
+& \qw & \targ{} & \ctrl{-1} & \targ{} & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+The \verb!label style! key can be used to tune the label's properties, including positioning. For example,
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1}\gategroup[2,steps=3,style={dashed,rounded corners,fill=blue!20, inner xsep=2pt},background,label style={label position=below,anchor=north,yshift=-0.2cm}]{{\sc swap}} & \targ{} & \ctrl{1} & \qw & \qw \\
+& \qw & \targ{} & \ctrl{-1} & \targ{} & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H} & \ctrl{1}\gategroup[2,steps=3,style={dashed,rounded corners,fill=blue!20, inner xsep=2pt},background,label style={label position=below,anchor=north,yshift=-0.2cm}]{{\sc swap}} & \targ{} & \ctrl{1} & \qw & \qw \\
+& \qw & \targ{} & \ctrl{-1} & \targ{} & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Note that it is often good to use \verb!anchor=mid! for label anchors because if you have multiple labels, this will help get them horizontally aligned. It just means you have to use some \verb!yshift! to move the label off the border around the gategroup.
+
+
+At this point, we mention an extra option for the gate command. The \verb!swap! keyword turns the gate into a variant of a {\sc swap} gate which explicitly shows the wires (the \verb!wires! setting is fixed to 2, overriding any value you might supply).
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H} & \gate[swap]{} & \qw & \qw \\
+& \qw &  & \gate{H} & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H} & \gate[swap]{} & \qw & \qw \\
+& \qw &  & \gate{H} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+\section{Otherwise Undocumented Features}
+A wave for separating rows. Do we really need this? Perhaps not, but it's fun!
+\begin{Code}
+\begin{center}
+\begin{tikzcd}
+& \gate{H} & \ctrl{3} & \ \ldots\ \qw & \qw & \gate{H} & \qw \\
+\wave&&&&&&\\
+& \gate{H} & \qw & \ \ldots\ \qw & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \gate{U} & \ \ldots\ \qw & \gate{U^k} & \qw & \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}
+& \gate{H} & \ctrl{3} & \ \ldots\ \qw & \qw & \gate{H} & \qw \\
+\wave&&&&&&\\
+& \gate{H} & \qw & \ \ldots\ \qw & \ctrl{1} & \gate{H} & \qw \\
+& \qw & \gate{U} & \ \ldots\ \qw & \gate{U^k} & \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+
+\section{Converting from QCircuit}
+
+I've updated all of my existing teaching materials from QCircuit to Quantikz with very little trouble. There are a few standard replacements:
+\begin{center}
+\begin{tabular}{c|c}
+QCircuit notation & Quantikz notation \\
+\hline
+\verb!\QCircuit @C=n @R=m {#}! & \verb!\begin{tikzcd}[row sep=m,col sep=n]#\end{tikzcd}!	\\
+\verb!\multigate{n}! & \verb!\gate[n+1]!	\\
+\verb!\targ! & \verb!\targ{}! \\
+\verb!\control! & \verb!\control{}! \\
+\verb!\meter! & \verb!\meter{}! \\
+\verb!\measureD! & \verb!\meterD{}! \\
+\end{tabular}
+\end{center}
+Updating the \verb!\gategroup! command requires a little more care since the first two arguments have to be removed, and the command placed in the correct cell, at which point \verb!\gategroup{i}{j}{k}{l}{m}! becomes \verb!\gategroup[wires=k+1-i,steps=l+1-j]!. My primary use of gategroup was to achieve the effect now achieved with \verb!\lstick[k+1-i]!.
+
+\section{Troubleshooting}
+\begin{itemize}
+\item Have you checked that all commands that need them are followed by an empty argument, \{\}? Things like \verb!meter!, \verb!\control! (basically, those that can accept an optional styling parameter) look like they don't take any parameters, but they have to be followed by the pair of braces or you'll get very odd effects.
+\item If you get a whole bunch of unexpected text in one of your cells instead of a gate, make sure that the gate command is the first command in the cell, and that other commands (such as \verb!\qwbundle!) appear after.
+\item If you're getting errors about cells not being found (and especially if you're doing any slicing), check that your last row doesn't end with \textbackslash\textbackslash, and make sure that your last row contains as many cells (even if they're empty) as there are columns in the matrix.
+\item If you are trying to typeset your circuit inside some sort of tabular or align environment and are getting an error ``single ampersand used with wrong catcode'', trying adding the \verb![ampersand replacement=\&]! option to tikzcd, and instead of separating every cell by \&, use \textbackslash\&. This can also be useful if you want to insert a normal matrix as a gate
+\begin{Code}
+\begin{center}
+\begin{tikzcd}[ampersand replacement=\&]
+\lstick{\ket{0}} \& \gate{\left(\begin{array}{cc} \alpha & \beta \\ \beta & -\alpha \end{array}\right)} \& \ctrl{1} \& \gate{U_1} \& \qw \\
+\lstick{\ket{0}} \& \qw \& \targ{} \& \gate{U_2} \& \qw
+\end{tikzcd}
+\end{center}
+\tcblower
+\begin{lstlisting}
+\begin{tikzcd}[ampersand replacement=\&]
+\lstick{\ket{0}} \& \gate{\left(\begin{array}{cc} \alpha & \beta \\ \beta & -\alpha \end{array}\right)} \& \ctrl{1} \& \gate{U_1} \& \qw \\
+\lstick{\ket{0}} \& \qw \& \targ{} \& \gate{U_2} \& \qw
+\end{tikzcd}
+\end{lstlisting}
+\end{Code}
+Beamer is particularly annoying with doing this. It probably helps to issue a global command
+\begin{lstlisting}
+\tikzcdset{
+	every matrix/.style={ampersand replacement=\&}
+}
+\end{lstlisting}
+somewhere in your document preamble. The tikzcd manual suggests another possible strategy, but I haven't had much success with it.
+\item If you have a \verb!\cwbend! in the bottom right cell of the matrix, sometimes you get an error (I have no understanding of why). Add an extra \& after, and all seems to be well.
+\end{itemize}
+\end{document} 
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/quantikz/tikzlibraryquantikz.code.tex b/Master/texmf-dist/tex/latex/quantikz/tikzlibraryquantikz.code.tex
new file mode 100644
index 00000000000..7d6a96319a4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/quantikz/tikzlibraryquantikz.code.tex
@@ -0,0 +1,534 @@
+%This is the quantikz library for typesetting quantum circuits using LaTeX/Tikz. version 0.9.1
+%Written by Alastair Kay, 2018. Published under a CC-BY-4.0 licence
+% Please email me with any bug reports or feature requests.
+%If you find this library useful, please cite its usage in your work,using the DOI: 10.17637/rh.7000520.
+% Usage is at your own risk.
+
+%version 0.9.2:
+%	made 'wires' the default key, so [wires=2] now becomes [2]
+%	added 'slice title', 'slices style', 'slices label style' key to control titles of slices under 'slice all'
+%	better access to positioning of gategroup label.
+%	now arXiv compatible (that was a challenge! they use old versions of packages)
+%Previous versions:
+%version 0.9.1:
+%	added \cwbend gate for cornering classical wires.
+%	made size of strike through for multiqubit gates stylable via the keys /quantikz/Strike Height/ and /quantikz/Strike Width/
+%	added new \gate[swap] variant of swap (nearest-neighbour only).
+%version 0.9.0:
+%original release.
+
+
+% Package(s) to include
+\RequirePackage{xargs,ifthen,xstring,xparse,etoolbox}
+\RequirePackage{tikz}
+%\RequirePackage{pgffor,pgfmath}
+\usetikzlibrary{cd,decorations.pathreplacing,calc,positioning,fit,shapes.symbols,decorations.pathmorphing,shapes.misc,backgrounds,decorations.markings}
+
+\makeatletter
+\newcounter{aaa}
+\tikzset{
+  apply/.style args={#1 except on segments #2}{postaction={
+      /utils/exec={
+        \@for\mattempa:=#2\do{\csdef{aaa@\mattempa}{}}
+        \setcounter{aaa}{0}
+      },
+      decorate,decoration={show path construction,
+        moveto code={},
+        lineto code={
+          \stepcounter{aaa}
+          \ifcsdef{aaa@\theaaa}{}{
+            \path[#1] (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast);
+          }
+        },
+        curveto code={
+          \stepcounter{aaa}
+          \ifcsdef{aaa@\theaaa}{}{
+            \path [#1] (\tikzinputsegmentfirst) .. controls
+            (\tikzinputsegmentsupporta) and (\tikzinputsegmentsupportb)
+            ..(\tikzinputsegmentlast);
+          }
+        },
+        closepath code={
+          \stepcounter{aaa}
+          \ifcsdef{aaa@\theaaa}{}{
+            \path [#1] (\tikzinputsegmentfirst) -- (\tikzinputsegmentlast);
+          }
+        },
+      },
+    },
+  },
+}
+
+\long\def\ifnodedefined#1#2#3{%
+    \@ifundefined{pgf@sh@ns@#1}{#3}{#2}%
+}
+
+%the main gate command
+\newcommand\gate[2][]{%optional parameter contains styling info. compulsory is gate text.
+	\def\toswap{0}
+	\edef\options{row=\the\pgfmatrixcurrentrow,col=\the\pgfmatrixcurrentcolumn,#1}
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}
+ 	\pgfkeys{/quantikz,#1}%
+	\pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+	\pgfkeysgetvalue{/quantikz/style}{\a}
+	\pgfkeysgetvalue{/quantikz/label style}{\b}
+	\edef\n{\the\pgfmatrixcurrentrow}
+	\edef\m{\the\pgfmatrixcurrentcolumn}
+	\ifthenelse{\toswap=1}{\def\quantwires{2}\phantom{wide}}{\phantom{#2}}
+	\edef\k{\the\numexpr\n+\quantwires-1\relax}
+	\foreach \i in {\n,...,\k} {
+		\edef\from{\i-\m}
+		\edef\to{\i-\the\numexpr\m-1\relax}
+		\expandafter\expandafter\expandafter\vqwexplicit\expandafter\expandafter\expandafter{\expandafter\from\expandafter}\expandafter{\to}
+	}
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendsavedpaths\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\gate@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\a\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\b\expandafter}\expandafter{\options}{#2}
+	}
+}
+%deferred gate command
+\newcommand{\gate@end}[4]{
+	\pgfkeys{/quantikz,wires=1}
+	\def\toswap{0}
+ 	\pgfkeys{/quantikz,#3}%
+	\pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+	\pgfkeysgetvalue{/quantikz/row}{\row}
+	\pgfkeysgetvalue{/quantikz/col}{\col}
+	\ifthenelse{\toswap=1}{\def\quantwires{2}}{}
+	\xdef\LoopGG{}
+	\foreach \n in  {\row,...,\the\numexpr\row+\quantwires-1\relax} {
+	\ifnodedefined{\tikzcdmatrixname-\n-\col}{
+		\xdef\LoopGG{\LoopGG(\tikzcdmatrixname-\n-\col)}
+		}{}
+	}
+	\ifthenelse{\toswap=1}{
+		\node (group\tikzcdmatrixname-\row-\col) [fit=\LoopGG,operator,inner xsep=3pt,inner ysep=5pt,#1] {\hphantom{wide}};
+		\draw [thick] (group\tikzcdmatrixname-\row-\col.west|-\tikzcdmatrixname-\row-\col.center) to[out=0,in=180] (group\tikzcdmatrixname-\row-\col.east|-\tikzcdmatrixname-\the\numexpr\row+1\relax-\col.center);
+		\draw [line width=3pt,white,shorten >=0.9pt,shorten <=0.9pt] (group\tikzcdmatrixname-\row-\col.east|-\tikzcdmatrixname-\row-\col.center) to[out=180,in=0] (group\tikzcdmatrixname-\row-\col.west|-\tikzcdmatrixname-\the\numexpr\row+1\relax-\col.center);
+		\draw [thick] (group\tikzcdmatrixname-\row-\col.east|-\tikzcdmatrixname-\row-\col.center) to[out=180,in=0] (group\tikzcdmatrixname-\row-\col.west|-\tikzcdmatrixname-\the\numexpr\row+1\relax-\col.center);
+	}{
+	  \node (group\tikzcdmatrixname-\row-\col) [fit=\LoopGG,operator,inner xsep=3pt,inner ysep=5pt,label={[gg label,#2]$#4$},#1] {\hphantom{$#4$}};
+	}
+}
+
+
+%single slice
+\newcommand\slice[2][]{%
+	%\edef\currcol{\the\pgfmatrixcurrentcolumn}
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}
+	\pgfkeys{/quantikz,#1}%
+ 	\edef\options{\pgfkeysvalueof{/quantikz/style}}
+ 	\edef\opts{\pgfkeysvalueof{/quantikz/label style}}
+	\edef\n{\the\pgfmatrixcurrentcolumn}
+	%\expandafter\show\n
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendslices\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\slice@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\n\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\options\expandafter}\expandafter{\opts}{#2}%
+	}}
+%deferred slice command
+\newcommand{\slice@end}[4]{
+	\edef\top{($1/2*(\tikzcdmatrixname-col#1.east |- \tikzcdmatrixname-row1.north)+1/2*(\tikzcdmatrixname-col\the\numexpr#1+1\relax.west |- \tikzcdmatrixname-row1.north)$)}
+	\edef\bottom{($1/2*(\tikzcdmatrixname-col#1.east |- \tikzcdmatrixname-row\the\pgfmatrixcurrentrow.south)+1/2*(\tikzcdmatrixname-col\the\numexpr#1+1\relax.west |- \tikzcdmatrixname-row\the\pgfmatrixcurrentrow.south)+(0,-3pt)$)}
+	\expandafter\expandafter\expandafter\make@slice\expandafter\expandafter\expandafter{\expandafter\top\expandafter}\expandafter{\bottom}{#4}{#2}{#3}
+}
+\newcommand{\make@slice}[5]{
+	\draw[slice,#4] #1 to node[pos=0,inner sep=4pt,anchor=south,color=black,#5] {#3} #2;
+}
+%deferred command which will slice everything
+\newcommand{\sliceallr}{
+	\foreach \n in  {2,...,\the\numexpr\pgfmatrixcurrentcolumn-1-\pgfkeysvalueof{/tikz/remove end slices}\relax} {
+		\edef\col{\the\numexpr\n-1\relax}
+		\edef\title{\pgfkeysvalueof{/tikz/slice titles}}
+		\edef\sstyle{\pgfkeysvalueof{/tikz/slice style}}
+		\edef\slstyle{\pgfkeysvalueof{/tikz/slice label style}}
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\slice@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\n\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\sstyle\expandafter}\expandafter{\slstyle}{\title}
+	}
+}
+
+%labelling of inputs
+\newcommand\lstick[2][]{%
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}
+	\pgfkeys{/quantikz,#1}%
+	\edef\newoptions{row=\the\pgfmatrixcurrentrow,col=\the\pgfmatrixcurrentcolumn,#1}
+	\pgfkeysgetvalue{/quantikz/label style}{\options}
+	\pgfkeysgetvalue{/quantikz/braces}{\opts}
+	%\edef\n{\the\pgfmatrixcurrentrow}
+	%\edef\m{\the\pgfmatrixcurrentcolumn}
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendsavedpaths\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\groupinput@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\newoptions\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\options\expandafter}\expandafter{\opts}{#2}%
+	}
+}
+%labelling of outputs
+\newcommand\rstick[2][]{%
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}
+	\pgfkeys{/quantikz,#1}%
+	\edef\newoptions{row=\the\pgfmatrixcurrentrow,col=\the\pgfmatrixcurrentcolumn,#1}
+	\pgfkeysgetvalue{/quantikz/label style}{\options}
+	\pgfkeysgetvalue{/quantikz/braces}{\opts}
+	%\edef\n{\the\pgfmatrixcurrentrow}
+	%\edef\m{\the\pgfmatrixcurrentcolumn}
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendsavedpaths\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\groupoutput@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\newoptions\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\options\expandafter}\expandafter{\opts}{#2}%
+	}
+}
+%deferred labelling of inputs
+\newcommand{\groupinput@end}[4]{%basic data as keys, lable options, brace options, text
+	\pgfkeys{/quantikz,wires=1}
+ 	\pgfkeys{/quantikz,#1}%
+	\pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+	\pgfkeysgetvalue{/quantikz/row}{\row}
+	\pgfkeysgetvalue{/quantikz/col}{\col}
+	\xdef\LoopGI{}
+	\foreach \n in  {\row,...,\the\numexpr\row+\quantwires-1\relax} {
+	\ifnodedefined{\tikzcdmatrixname-\n-\col}{
+		\xdef\LoopGI{\LoopGI(\tikzcdmatrixname-\n-\col)} 
+		}{}
+		}
+	\ifthenelse{\quantwires=1} {
+		\node (ingr-\row) [fit=\LoopGI, inner sep=0pt,label={[align=center,#2]left:#4}] {};
+	}{
+	\node (ingr-\row) [fit=\LoopGI, inner sep=0pt] {};
+	\draw[dm,#3] ($(ingr-\row.north west)+(-0.1cm,0.1cm)$) to node[midway,align=center,anchor=east,xshift=-0.1cm,#2] {#4} ($(ingr-\row.south west)+(-0.1cm,-0.1cm)$);
+	}
+} %
+%deferred labelling of outputs
+\newcommand{\groupoutput@end}[4]{%basic data as keys, lable options, brace options, text
+	\pgfkeys{/quantikz,wires=1}
+ 	\pgfkeys{/quantikz,#1}%
+	\pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+	\pgfkeysgetvalue{/quantikz/row}{\row}
+	\pgfkeysgetvalue{/quantikz/col}{\col}
+	\xdef\LoopGO{}
+	\foreach \n in  {\row,...,\the\numexpr\row+\quantwires-1\relax} {
+		\ifnodedefined{\tikzcdmatrixname-\n-\col}{
+			\xdef\LoopGO{\LoopGO(\tikzcdmatrixname-\n-\col)} 
+		}}
+		\ifthenelse{\quantwires=1} {
+		\node (outgr-\row) [fit=\LoopGO, inner sep=0pt,label={[align=center,#2]right:#4}] {};
+	}{
+	\node (outgr-\row) [fit=\LoopGO, inner sep=0pt] {};
+	\draw[dd,#3] ($(outgr-\row.north east)+(0.1cm,0.1cm)$) to node[midway,align=center,anchor=west,xshift=0.1cm,#2] {#4} ($(outgr-\row.south east)+(0.1cm,-0.1cm)$);
+	}
+} %
+%inputs and outputs within a multi-wire gate
+\newcommand\gateinput[2][]{%
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}%
+	\pgfkeys{/quantikz,#1}%
+	\edef\newoptions{row=\the\pgfmatrixcurrentrow,col=\the\pgfmatrixcurrentcolumn,#1}
+ 	\pgfkeysgetvalue{/quantikz/label style}{\options}
+ 	\pgfkeysgetvalue{/quantikz/braces}{\opts}%
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendlabels\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\mginput@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\newoptions\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\options\expandafter}\expandafter{\opts}{#2}%
+	}
+}
+\newcommand\gateoutput[2][]{%
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}
+	\pgfkeys{/quantikz,#1}%
+	\edef\newoptions{row=\the\pgfmatrixcurrentrow,col=\the\pgfmatrixcurrentcolumn,#1}
+ 	\pgfkeysgetvalue{/quantikz/label style}{\options}
+ 	\pgfkeysgetvalue{/quantikz/braces}{\opts}
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendlabels\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\mgoutput@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\newoptions\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\options\expandafter}\expandafter{\opts}{#2}%
+	}
+}
+%deferred functions for the above
+\newcommand{\mginput@end}[4]{%collected options,label style, brace style,text
+	\pgfkeys{/quantikz,wires=1}
+ 	\pgfkeys{/quantikz,#1}%
+ 	\edef\quantwires{\pgfkeysvalueof{/quantikz/wires}}
+	%\pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+	\pgfkeysgetvalue{/quantikz/row}{\row}
+	\pgfkeysgetvalue{/quantikz/col}{\col}
+%can we find the gategroup node?
+\xdef\cell{group\tikzcdmatrixname-1-\col}
+\foreach \n in {\row,...,1} {%
+	%test if node group-\n-#2 exists
+	\ifnodedefined{group\tikzcdmatrixname-\n-\col}{%
+    	\xdef\cell{group\tikzcdmatrixname-\n-\col}
+    	\breakforeach
+	}{}
+}
+\ifthenelse{\quantwires=1}{%
+	\node at ($(\cell.west |- \tikzcdmatrixname-\row-\col.west)+(0,0cm)$)[leftinternal,#2]{#4};
+}{%
+%\show\quantwires
+\draw[dd,#3] ($(\cell.west |- \tikzcdmatrixname-\row-\col.west)+(0.1cm,0.1cm)$) to node[leftinternal,midway,#2] {#4} ($(\cell.west |- \tikzcdmatrixname-\the\numexpr\row+\quantwires-1\relax-\col.west)+(0.1cm,-0.1cm)$);
+}
+} %
+\newcommand{\mgoutput@end}[4]{%
+	\pgfkeys{/quantikz,wires=1}
+ 	\pgfkeys{/quantikz,#1}%
+ 	\edef\quantwires{\pgfkeysvalueof{/quantikz/wires}}
+	%\pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+	\pgfkeysgetvalue{/quantikz/row}{\row}
+	\pgfkeysgetvalue{/quantikz/col}{\col}
+%can we find the gategroup node?
+\xdef\cell{group\tikzcdmatrixname-1-\col}
+\foreach \n in {\row,...,1} {%
+	%test if node group-\n-#2 exists
+	\ifnodedefined{group\tikzcdmatrixname-\n-\col}{%
+    	\xdef\cell{group\tikzcdmatrixname-\n-\col}
+    	\breakforeach
+	}{}
+}
+\ifthenelse{\quantwires=1}{%
+	\node at ($(\cell.east |- \tikzcdmatrixname-\row-\col.east)+(0,0cm)$)[rightinternal,#2]{#4};
+}{%
+\draw[dm,#3] ($(\cell.east |- \tikzcdmatrixname-\row-\col.east)+(-0.1cm,0.1cm)$) to node[rightinternal,midway,#2] {#4} ($(\cell.east |- \tikzcdmatrixname-\the\numexpr\row+\quantwires-1\relax-\col.east)+(-0.1cm,-0.1cm)$);
+}
+} %
+
+%wave command
+\newcommand\wave[1][]{%
+	\edef\n{\the\pgfmatrixcurrentrow}
+	\expandafter\pgfutil@g@addto@macro\expandafter\tikzcd@atendslices\expandafter{%
+		\expandafter\wave@end\expandafter{\n}{#1}%
+	}
+}
+%deferred wave
+\newcommand{\wave@end}[2]{
+	\node (wave-#1) [fit=(\tikzcdmatrixname-row#1),wave,#2] {};
+}
+
+
+\newcommand\gategroup[2][]{%
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=}
+	\pgfkeys{/quantikz,#1}%
+	\edef\newoptions{row=\the\pgfmatrixcurrentrow,col=\the\pgfmatrixcurrentcolumn,#1}
+ 	\pgfkeysgetvalue{/quantikz/style}{\options}
+ 	\pgfkeysgetvalue{/quantikz/label style}{\opts}
+	\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendlabels\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
+		\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\gategroup@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\newoptions\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\options\expandafter}\expandafter{\opts}{#2}%
+	}
+}
+
+\newcommand{\gategroup@end}[4]{%options, gate style, text style, text
+	\pgfkeys{/quantikz,wires=1,style=,label style=,braces=,steps=1}%
+	\edef\background{0}%
+	\pgfkeys{/quantikz,#1}%
+	\pgfkeysgetvalue{/quantikz/wires}{\quantwires}%
+	\pgfkeysgetvalue{/quantikz/row}{\row}%
+	\pgfkeysgetvalue{/quantikz/col}{\col}%
+	\pgfkeysgetvalue{/quantikz/steps}{\steps}%
+	\edef\fit{(\tikzcdmatrixname-col\col.west |- \tikzcdmatrixname-row\row.north)(\tikzcdmatrixname-col\the\numexpr\col+\steps-1\relax.east |- \tikzcdmatrixname-row\the\numexpr\row+\quantwires-1\relax.south)}%
+	\ifthenelse{\background=1}{%
+		\begin{scope}[on background layer]\node (ggroup-\row-\col) [fit=\fit,draw,inner sep=4pt,thick,label={[group label,#3]:#4},#2] {};\end{scope}
+	}{%
+		\node (ggroup-\row-\col) [fit=\fit,draw,inner sep=4pt, thick,label={[group label,#3]:#4},#2] {};
+	}
+}
+
+%use for fudging classical wires that have horizontal and vertical sections
+\newcommand{\cwbend}[1]{
+	\vcw{#1}\cw
+	\edef\cell{\the\pgfmatrixcurrentrow-\the\pgfmatrixcurrentcolumn}
+	\expandafter\pgfutil@g@addto@macro\expandafter\tikzcd@atendlabels\expandafter{%
+		\expandafter\latephase@end\expandafter{\cell}
+	}
+}
+
+\newcommand{\latephase@end}[1]{
+	\node [phase,inner sep=2pt] at (\tikzcdmatrixname-#1) {};
+}
+
+
+%patch tikzcd to allow for multiple layers of commands
+\patchcmd\tikzcd@{\tikzpicture}{\def\toslice{0}
+ \tikzpicture}{}{}
+\patchcmd\tikzcd@
+    {\global\let\tikzcd@savedpaths\pgfutil@empty}
+    {\global\let\tikzcd@savedpaths\pgfutil@empty
+    \global\let\tikzcd@atendsavedpaths\pgfutil@empty
+    \global\let\tikzcd@atendlabels\pgfutil@empty
+    \global\let\tikzcd@atendslices\pgfutil@empty
+    \pgfutil@g@addto@macro\tikzcd@savedpaths\DivideRowsCols
+    %\pgfmathsetmacro{\mname}{random(100000)}
+    \ifthenelse{\toslice=1}{\pgfutil@g@addto@macro\tikzcd@atendslices\sliceallr}{}
+    }{}{}
+
+%this patching works on modern systems, but I believe is incompatible with the old version that arXiv is running
+%\patchcmd\endtikzcd{\tikzcd@savedpaths}{\tikzcd@savedpaths\tikzcd@atendsavedpaths\tikzcd@atendlabels\tikzcd@atendslices}{}{}
+
+%instead, completely redefine the function
+\def\endtikzcd{%
+  \pgfmatrixendrow\egroup%
+  \pgfextra{\global\let\tikzcdmatrixname\tikzlastnode};%
+  \tikzcdset{\the\pgfmatrixcurrentrow-row diagram/.try}%
+  \begingroup%
+    \pgfkeys{% `quotes' library support
+      /handlers/first char syntax/the character "/.initial=\tikzcd@forward@quotes,%
+      /tikz/edge quotes mean={%
+        edge node={node [execute at begin node=\iftikzcd@mathmode$\fi,%$
+                         execute at end node=\iftikzcd@mathmode$\fi,%$
+                         /tikz/commutative diagrams/.cd,every label,##2]{##1}}}}%
+    \let\tikzcd@errmessage\errmessage% improve error messages
+    \def\errmessage##1{\tikzcd@errmessage{##1^^J...^^Jl.\tikzcd@lineno\space%
+        I think the culprit is a tikzcd arrow in cell \tikzcd@currentrow-\tikzcd@currentcolumn}}%
+    \tikzcd@before@paths@hook%
+    \tikzcd@savedpaths\tikzcd@atendsavedpaths\tikzcd@atendlabels\tikzcd@atendslices%I just added stuff here instead
+  \endgroup%
+  \endtikzpicture%
+  \ifnum0=`{}\fi}
+
+
+%end patching
+\makeatother
+
+%this command runs after we've finished the matrix, and makes unified cells for each row and each column. This allows much nicer alignment of large boxes.
+\newcommand{\DivideRowsCols}{
+	\foreach \n in {1,...,\the\pgfmatrixcurrentrow} {%for each row, construct a master cell that contains all entries
+	\xdef\LoopRow{}
+		\foreach \m in {1,...,\the\pgfmatrixcurrentcolumn}{
+			\ifnodedefined{\tikzcdmatrixname-\n-\m}{
+				\xdef\LoopRow{\LoopRow(\tikzcdmatrixname-\n-\m)}
+			}{}
+			\ifnodedefined{group\tikzcdmatrixname-\n-\m}{
+				\xdef\LoopRow{\LoopRow(group\tikzcdmatrixname-\n-\m)}
+			}{}
+	}
+	\node (\tikzcdmatrixname-row\n) [fit=\LoopRow] {};
+	}
+	\foreach \n in {1,...,\the\pgfmatrixcurrentcolumn} {%for each column, construct a master cell that contains all entries
+	\xdef\LoopCol{}
+		\foreach \m in {1,...,\the\pgfmatrixcurrentrow}{
+			\ifnodedefined{\tikzcdmatrixname-\m-\n}{
+				\xdef\LoopCol{\LoopCol(\tikzcdmatrixname-\m-\n)}
+			}{}
+			\ifnodedefined{group\tikzcdmatrixname-\m-\n}{
+				\xdef\LoopCol{\LoopCol(group\tikzcdmatrixname-\m-\n)}
+			}{}
+	}
+	\node (\tikzcdmatrixname-col\n) [fit=\LoopCol] {};
+	}
+}
+
+%initialise all the pgfkeys for key=value parametre passing in macro options
+
+\pgfkeys{/tikz/slice all/.code={\def\toslice{1}},/tikz/remove end slices/.initial=0,/tikz/slice titles/.initial={\col},/tikz/slice style/.initial={},/tikz/slice label style/.initial={}}
+\pgfkeys{/quantikz/.is family,/quantikz,%
+.unknown/.style={%
+	/quantikz/wires=\pgfkeyscurrentname
+},%
+wires/.initial=1,%
+style/.initial={},label style/.initial={},braces/.initial={},background/.code={\def\background{1}},alternate/.code={\def\helper{1}},row/.initial=1,col/.initial=1,steps/.initial=1,Strike Width/.initial=0.08cm,Strike Height/.initial=0.12cm,swap/.code={\def\toswap{1}}}
+%\pgfkeys{/quantikz/.unknown/.style={/tikz}}
+%\pgfkeys{/tikz/background/.style={},/tikz/wires/.style={}}
+
+%Define some useful commands
+\providecommand{\ket}[1]{\ensuremath{\left | #1 \right\rangle}}
+\providecommand{\bra}[1]{\ensuremath{\left \langle #1 \right |}}
+\providecommand{\proj}[1]{\ket{#1}\bra{#1}}
+
+%single qubit operations
+\newcommand{\phantomgate}[1]{|[linecont,thick, inner ysep=3pt]| \phantom{#1} \qw}
+\newcommand{\hphantomgate}[1]{|[linecont,minimum size=1.5em,thick]| \hphantom{#1} \qw}
+\newcommand{\push}[1]{#1 \qw}
+\DeclareExpandableDocumentCommand{\phase}{O{}m}{|[phase,label={[phase label]#2},#1]| {} \qw}
+\DeclareExpandableDocumentCommand{\control}{O{}m}{|[phase,#1]| {} \qw}
+\DeclareExpandableDocumentCommand{\ocontrol}{O{}m}{|[ophase,#1]| {} \qw}
+\DeclareExpandableDocumentCommand{\targ}{O{}m}{|[circlewc,#1]| {} \qw}
+\DeclareExpandableDocumentCommand{\targX}{O{}m}{|[crossx2,#1]| {} \qw}
+
+%measuring
+\DeclareExpandableDocumentCommand{\meter}{O{}{m}}{|[meter,label={[my label]#2},#1]| {} \qw}
+\DeclareExpandableDocumentCommand{\measuretab}{O{}{m}}{|[measuretab,#1]| {#2} \qw}
+\DeclareExpandableDocumentCommand{\meterD}{O{}{m}}{|[meterD,#1]| {#2} \qw}
+\DeclareExpandableDocumentCommand{\measure}{O{}{m}}{|[measure,#1]| {#2} \qw}
+
+%controlled gates
+\def\ctrl#1{\control{}	\vqw{#1}}
+\def\octrl#1{\ocontrol{}\vqw{#1}}
+\def\swap#1{%
+	\targX{}
+	\edef\start{\the\pgfmatrixcurrentrow-\the\pgfmatrixcurrentcolumn}
+	\edef\end{\the\numexpr#1+\pgfmatrixcurrentrow\relax-\the\pgfmatrixcurrentcolumn}
+	\expandafter\expandafter\expandafter\vqwexplicitcenter\expandafter\expandafter\expandafter{\expandafter\start\expandafter}\expandafter{\end}
+}
+
+%vertical wires
+%classical vertical wire, relative positioning
+\newcommand{\vcw}[1]{
+	\edef\start{\the\pgfmatrixcurrentrow-\the\pgfmatrixcurrentcolumn}
+	\edef\end{\the\numexpr#1+\pgfmatrixcurrentrow\relax-\the\pgfmatrixcurrentcolumn}
+	\expandafter\expandafter\expandafter\vcwexplicit\expandafter\expandafter\expandafter{\expandafter\start\expandafter}\expandafter{\end}
+}
+%vertical quantum wire, relative positioning
+\newcommand{\vqw}[1]{
+	\edef\start{\the\pgfmatrixcurrentrow-\the\pgfmatrixcurrentcolumn}
+	\edef\end{\the\numexpr#1+\pgfmatrixcurrentrow\relax-\the\pgfmatrixcurrentcolumn}
+	\expandafter\expandafter\expandafter\vqwexplicit\expandafter\expandafter\expandafter{\expandafter\start\expandafter}\expandafter{\end}
+}
+%quantum wire, absolute positioning
+\newcommand{\vqwexplicit}[2]{
+	\arrow[from=#1,to=#2,dash,thick] {}
+}
+\newcommand{\vcwexplicit}[2]{
+	\arrow[from=#1,to=#2,dash,thick,xshift=0.05cm] {}\arrow[from=#1,to=#2,dash,thick,xshift=-0.05cm] {}
+}
+%quantum wire, absolute positioning, going to centres of cell, not edge.
+\newcommand{\vqwexplicitcenter}[2]{
+	\arrow[from=#1,to=#2,dash,thick,start anchor=center,end anchor=center] {}
+}
+
+%horizontal wires
+\newcommand{\qw}{\ifthenelse{\the\pgfmatrixcurrentcolumn>1}{\arrow[dash,thick]{l}}{}}
+\newcommand{\cw}{\ifthenelse{\the\pgfmatrixcurrentcolumn>1}{\arrow[dash,thick,yshift=0.05cm]{l}\arrow[dash,thick,yshift=-0.05cm]{l}}{}}
+%define the strike distance for strike-through on qwbundle.
+%\newcommand*{\StrikeDistance}{0.1cm}%
+%a bundle of horizontal quantum wires
+\newcommand{\qwbundle}[1][]{\ifthenelse{\the\pgfmatrixcurrentcolumn>1}{
+	\def\helper{0}
+	\pgfset{/quantikz,#1}
+	\ifthenelse{\helper=1}{
+		\arrow[dash,thick,yshift=0.1cm]{l}\arrow[dash,thick]{l}\arrow[dash,thick,yshift=-0.1cm]{l}
+	}{
+	\arrow[phantom,strike arrow]{l}
+	}}{}}
+
+
+
+
+%configure some of the style properties.
+\tikzcdset{row sep/normal=0.5cm,column sep/normal=0.5cm,thick,nodes in empty cells,every cell/.style={
+        anchor=center,minimum size=0pt,inner sep=0pt,outer sep=0pt,thick
+    }
+    }
+\tikzset{
+    operator/.style={draw,fill=white,minimum size=1.5em, inner xsep=2pt,thick,align=center},
+    leftinternal/.style={anchor=mid west,font=\scriptsize,inner sep=4pt,align=center},
+    rightinternal/.style={anchor=mid east,font=\scriptsize,inner sep=4pt,align=center},
+    wave/.style={inner sep=-3pt,tape,fill=white,apply={draw=black} except on segments {5,6,1,2,9}},
+    phase/.style={fill,shape=circle,minimum size=4pt},
+    phase label/.style={label distance=2mm,label position=45,anchor=mid},
+    ophase/.style={fill=white,draw=black,shape=circle,minimum size=4pt},
+    line/.style={path picture={ 
+\draw[thick,black](path picture bounding box.west) -- (path picture bounding box.east);
+}},
+	linecont/.style={circle,line},
+    cross/.style={path picture={ 
+\draw[thick,black](path picture bounding box.north) -- (path picture bounding box.south) (path picture bounding box.west) -- (path picture bounding box.east);
+}},
+    circlewc/.style={draw,circle,cross,minimum width=4pt,inner sep=3pt},
+    crossx/.style={path picture={ 
+\draw[thick,black,inner sep=0pt]
+(path picture bounding box.south east) -- (path picture bounding box.north west) (path picture bounding box.south west) -- (path picture bounding box.north east) (path picture bounding box.west) -- (path picture bounding box.east);
+}},
+	crossx2/.style={circle,crossx,minimum size=1em},
+    dd/.style={decoration={brace},decorate,thick},
+    dm/.style={decoration={brace,mirror},decorate,thick},
+    slice/.style={thick,red,dash pattern=on 5pt off 3pt,align=center},
+    meter/.style={draw,fill=white,minimum width=2em,minimum height=1.5em, rectangle, font=\vphantom{A}, line width=.8,
+ path picture={\draw[black] ([shift={(.1,.24)}]path picture bounding box.south west) to[bend left=50] ([shift={(-.1,.24)}]path picture bounding box.south east);\draw[black,-{Latex[scale=0.6]}] ([shift={(0,.1)}]path picture bounding box.south) -- ([shift={(.3,-.1)}]path picture bounding box.north);}},
+ 	measuretab/.style={draw,signal,signal to=west,inner sep=4pt,fill=white},
+ 	meterD/.style={draw,rounded rectangle,rounded rectangle left arc=none,inner sep=4pt,fill=white},
+ 	measure/.style={draw,rounded rectangle,inner sep=4pt,fill=white},
+ 	my label/.style={yshift=0.1cm,above,align=center},
+ 	gg label/.style={label position=center,align=center},
+ 	group label/.style={label position=above,yshift=0.2cm,anchor=mid},
+ 	strike arrow/.style={
+    decoration={markings, mark=at position 0.5 with {
+        \draw [black, thick,-] 
+            ++ (-\pgfkeysvalueof{/quantikz/Strike Width},-\pgfkeysvalueof{/quantikz/Strike Height} )
+            -- ( \pgfkeysvalueof{/quantikz/Strike Width}, \pgfkeysvalueof{/quantikz/Strike Height});}	%can I use pgfkeys and do some maths here?
+    },
+    postaction={decorate},
+}
+}
\ No newline at end of file
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 2a95114fb8e..5d915ef133f 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -551,7 +551,7 @@ my @TLP_working = qw(
     pxpgfmark pxrubrica pxtatescale pxtxalfa pxufont
     pygmentex python pythonhighlight pythontex
   qcircuit qcm qobitree qrcode qstest qsymbols qtree
-     quattrocento quicktype quotchap quoting quotmark quran
+     quantikz quattrocento quicktype quotchap quoting quotmark quran
   r_und_s raleway ran_toks randbild randomlist randomwalk randtext
     rank-2-roots rccol rcs rcs-multi rcsinfo
     readarray realboxes realscripts rec-thy
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index 577062f2170..e08e552238d 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -112,6 +112,7 @@ depend prerex
 depend productbox
 depend pxpgfmark
 depend qcircuit
+depend quantikz
 depend qrcode
 depend randbild
 depend randomwalk
diff --git a/Master/tlpkg/tlpsrc/quantikz.tlpsrc b/Master/tlpkg/tlpsrc/quantikz.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/quantikz.tlpsrc