yquant (4apr21)

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

1 files changed, 400 insertions, 616 deletions

diff --git a/Master/texmf-dist/tex/latex/yquant/yquant-draw.tex b/Master/texmf-dist/tex/latex/yquant/yquant-draw.tex
index a74197192c7..1bf8d3fb19a 100644
--- a/Master/texmf-dist/tex/latex/yquant/yquant-draw.tex
+++ b/Master/texmf-dist/tex/latex/yquant/yquant-draw.tex
@@ -1,31 +1,96 @@
-% BEGIN_FOLD Actual drawing at shipout
 \newcount\yquant@draw@@currentcontroltype%
 
-\protected\def\yquant@draw@group#1#2#3#4#5{%
-   \begingroup%
-      \ifcsname\yquant@prefix xshift\endcsname%
-         \dimdef\yquant@draw@@x{#1+\csname\yquant@prefix xshift\endcsname}%
-      \else%
-         \def\yquant@draw@@x{#1}%
+\protected\def\yquant@draw@init#1#2{%
+   \ifcsname\yquant@prefix registermap@#1\endcsname%
+      % for connected subcircuit wires, check if this actually changes the type [happens for formerly discarded output wires] and flush the wire if necessary
+      \edef\yquant@draw@init@type{\yquant@register@get@type{#1}}%
+      \unless\if\yquant@draw@init@type#2\relax%
+         \yquant@circuit@flushwire{#1}%
+         \ifx\yquant@draw@init@type\yquant@register@type@none%
+            % in case the wire was discarded before, forget about the lastx position, it should always start with the others
+            \yquant@register@get@lastwire{#1}\wirelast%
+            \expandafter\expandafter\expandafter\ifstrempty\expandafter\expandafter\expandafter{%
+               \expandafter\@thirdoffour\wirelast%
+            }{%
+               \yquant@register@set@lastwire{#1}{%
+                  {\yquant@draw@subcircuit@wirestart}{\yquant@draw@subcircuit@wirestart}{}%
+                  {\unexpanded\expandafter\expandafter\expandafter{%
+                      \expandafter\@fourthoffour\wirelast%
+                   }}%
+               }%
+            }\relax
+         \fi%
+         \yquant@register@set@type{#1}{#2}%
       \fi%
+   \else%
+      % for new wires, reset the type, and if this a subcircuit, put the appropriate x position in place. It might have changed from its initial value during preparation stage
+      \yquant@register@set@type{#1}{#2}%
+      \ifdefined\yquant@draw@subcircuit@wirestart%
+         \yquant@register@set@x{#1}{\yquant@draw@subcircuit@wirestart}%
+         \yquant@register@set@lastwire{#1}{%
+            {\yquant@draw@subcircuit@wirestart}{\yquant@draw@subcircuit@wirestart}{}{}%
+         }%
+      \fi%
+   \fi%
+}
+
+\def\yquant@draw@subcircuit@leftpos{0pt}% outermost circuit: 0pt
+\protected\long\def\yquant@draw@group#1#2#3#4#5#6{%
+   \begingroup%
+      \yquant@register@get@maxxlist\yquant@draw@@x{#6}%
       \ifx F#2%
          \yquant@draw@@currentcontroltype=0 %
       \else%
-         \yquant@draw@@currentcontroltype=\yquant@register@get@type{#2}\relax%
+         \yquant@draw@@currentcontroltype=#2 %
       \fi%
       \let\yquant@circuit@extendcontrolline@cmd=\empty%
       \let\yquant@circuit@extendcontrolline@prev=\relax%
       \let\yquant@circuit@extendcontrolline@clip=\empty%
       \let\yquant@circuit@extendmultiline@total=\empty%
-      \yquant@langhelper@list@attrs%
-      % If the quotes library is loaded, activate it. (else, this is by default \relax)
-      \tikz@enable@node@quotes%
-      \yquant@set{#3}%
+      \def\yquant@draw@@width{#1}%
       \def\yquant@draw@@style{#4}%
       \def\yquant@draw@@content{#5}%
       \def\yquant@draw@@idx@content{0}%
       \def\yquant@draw@@idx@pcontrol{0}%
       \def\yquant@draw@@idx@ncontrol{0}%
+      % If the quotes library is loaded, activate it. (else, this is by default \relax)
+      \tikz@enable@node@quotes%
+      \yquant@config@operator@position@rightalignfalse%
+      \yquant@config@operator@position@advancetrue%
+      \yquant@set{#3}%
+      % if the operator is right-aligned, we will not advance, as we must assume that the x position is already chosen appropriately
+      \ifyquant@config@operator@position@rightalign%
+         % for rightalign, we instead overwrite the lastx configurations, so that the outgoing wire starts after the operator.
+         \forlistloop\yquant@draw@group@rightadvance{#6}%
+      \else%
+         \ifyquant@env@seamless{%
+            \unless\ifdim\yquant@draw@@x=\yquant@draw@subcircuit@leftpos%
+               \dimdef\yquant@draw@@x{%
+                  \yquant@draw@@x+\yquant@config@operator@sep%
+               }%
+            \fi%
+         }{%
+            \dimdef\yquant@draw@@x{%
+               \yquant@draw@@x+\yquant@config@operator@sep%
+            }%
+         }%
+         \ifyquant@config@operator@position@advance%
+            \dimdef\newx{\yquant@draw@@x+#1}%
+            \forlistloop\yquant@draw@group@advance{#6}%
+         \fi%
+         \dimdef\yquant@draw@@x{\yquant@draw@@x+.5\dimexpr#1\relax}%
+      \fi%
+}
+
+\protected\def\yquant@draw@group@advance#1{%
+   \yquant@register@set@x{#1}\newx%
+}
+
+\protected\def\yquant@draw@group@rightadvance#1{%
+   \ifcsname\yquant@prefix registermap@#1\endcsname%
+      % for connected subcircuit wires, make sure to flush the wire until the beginning.
+      \yquant@circuit@flushwire{#1}%
+   \fi%
 }
 
 \protected\def\yquant@draw@endgroup#1#2#3{%
@@ -57,8 +122,83 @@
    \endgroup%
 }
 
-\protected\long\def\yquant@draw@single#1#2{%
+\protected\def\yquant@draw@injectiongroup#1#2\yquant@draw@endinjectiongroup#3#4#5{%
+   \csdef{yquant@draw@@injection@#1}{%
+      \yquant@draw@begininjection#2\yquant@draw@stopinjection{#3}{#4}{#5}%
+   }%
+}
+
+\protected\long\def\yquant@draw@begininjection#1#2#3#4#5#6{%
+   % this is called within another draw group, so lots of things are already set up
+   \begingroup%
+      \def\yquant@draw@@style{#4}%
+      \def\yquant@draw@@content{#5}%
+      \let\yquant@draw@@idx@content=\yquant@draw@@idx@pcontrol%
+      \yquant@set{#3}% this will accumulate with outer styles from the enclosing draw group, but there is nothing we can do about it
+}
+
+\protected\def\yquant@draw@stopinjection#1#2#3{%
+   \ifcase#3\relax%
+   \or%
+      \yquant@draw@alias@ctrl{#2}n%
+   \or%
+      \yquant@draw@alias@ctrl{#2}p%
+   \or%
+      \yquant@draw@alias@ctrl{#2}p%
+      \yquant@draw@alias@ctrl{#2}n%
+   \or%
+      \yquant@draw@alias{#2}%
+   \or%
+      \yquant@draw@alias{#2}%
+      \yquant@draw@alias@ctrl{#2}n%
+   \or%
+      \yquant@draw@alias{#2}%
+      \yquant@draw@alias@ctrl{#2}p%
+   \or%
+      \yquant@draw@alias{#2}%
+      \yquant@draw@alias@ctrl{#2}p%
+      \yquant@draw@alias@ctrl{#2}n%
+   \fi%
+   \edef\process{%
+         \endgroup%
+         \def\noexpand\yquant@circuit@extendcontrolline@clip{%
+            \unexpanded\expandafter{\yquant@circuit@extendcontrolline@clip}%
+         }%
+         \def\noexpand\yquant@circuit@extendcontrolline@prev{%
+            \unexpanded\expandafter{\yquant@circuit@extendcontrolline@prev}%
+         }%
+         \def\noexpand\yquant@circuit@extendcontrolline@cmd{%
+            \unexpanded\expandafter{\yquant@circuit@extendcontrolline@cmd}%
+         }%
+         \def\noexpand\yquant@circuit@extendmultiline@total{%
+            \unexpanded\expandafter{\yquant@circuit@extendmultiline@total}%
+         }%
+         \def\noexpand\yquant@draw@@idx@pcontrol{\yquant@draw@@idx@content}%
+      }%
+   \process%
+}
+
+\protected\def\yquant@draw@inject#1{%
+   \csname yquant@draw@@injection@#1\endcsname%
+   \csgundef{yquant@draw@@injection@#1}%
+}
+
+\protected\def\yquant@draw@inject@outer#1{%
+   % we thought we wanted to inject #1, however, this was not valid; so now insert it directly.
+   \expandafter\expandafter\expandafter\yquant@draw@inject@outer@helper%
+      \csname yquant@draw@@injection@#1\endcsname%
+   \csgundef{yquant@draw@@injection@#1}%
+}
+
+\def\yquant@draw@inject@outer@helper\yquant@draw@begininjection#1\yquant@draw@stopinjection{%
+   \yquant@draw@group%
+      #1%
+   \yquant@draw@endgroup%
+}
+
+\protected\def\yquant@draw@single#1#2{%
    \let\idx=\yquant@draw@@idx@content%
+   \yquant@config@operator@multifalse%
    \edef\cmd{%
       \noexpand\path (\yquant@draw@@x, \yquant@register@get@y{#1})%
          node[/yquant/every operator, \yquant@draw@@style, /yquant/this operator,%
@@ -80,6 +220,7 @@
 }
 
 \protected\def\yquant@draw@multi#1#2#3#4#5{%
+   \yquant@config@operator@multitrue%
    \let\idx=\yquant@draw@@idx@content%
    \edef\yquant@draw@multi@@name{#5}%
    \def\yquant@draw@@idx@multipart{0}%
@@ -106,7 +247,7 @@
                          \yquant@register@get@y{#1}+\yquant@register@get@y{#2}\relax%
                       \relax)%
          node[/yquant/every operator, \yquant@draw@@style, /yquant/this operator,%
-              /yquant/operator/multi main=\ifnum#3=1 true\else false\fi\unless\ifnum#1=#2 ,%
+              /yquant/internal/multi main=\ifnum#3=1 true\else false\fi\unless\ifnum#1=#2 ,%
               y radius/.expanded=\the\dimexpr.5\dimexpr\yquant@register@get@ydist{#1}{#2}\relax\relax+%
                      .5*\noexpand\pgfkeysvalueof{/tikz/y radius}\fi,%
               name prefix=, name suffix=, name=yquantbox]%
@@ -145,17 +286,28 @@
    \let\pgfdecorationsegmentfromto=\empty%
    #4%
    \edef\pgfdecorationsegmentfromto{\expandafter\@gobble\pgfdecorationsegmentfromto}%
+   \yquant@config@operator@multitrue%
    % We need to somehow extract the y radius
    \edef\cmd{%
-      \noexpand\path[/yquant/every operator, \yquant@draw@@style,%
-                     /yquant/every multi label, /yquant/this operator]%
-         (\yquant@draw@@x, \yquant@draw@multiinit@@min) --%
-         (\yquant@draw@@x, \yquant@draw@multiinit@@max)%
-         node[name prefix=, name suffix=, name=yquantbox]%
+      \noexpand\path (\yquant@draw@@x, \the\dimexpr.5\dimexpr%
+                         \yquant@draw@multiinit@@min+\yquant@draw@multiinit@@max\relax%
+                      \relax)%
+         node[/yquant/every operator, \yquant@draw@@style,
+              \ifnum\yquant@compat<2 /yquant/every multi label,\fi%
+              /yquant/this operator,%
+              y radius=\yquant@abs{\the\dimexpr.5\dimexpr\yquant@draw@multiinit@@total\relax\relax},%
+              name prefix=, name suffix=, name=yquantbox]%
             {\unexpanded\expandafter{\yquant@draw@@content}};%
+      \pgfshapeclippath{yquantbox}%
+                       {/yquant/every operator, \yquant@draw@@style,%
+                        \ifnum\yquant@compat<2 /yquant/every multi label,\fi%
+                        /yquant/this operator}%
    }%
    \cmd%
-   % no wire extension (we are still at the initial position), no control line (init doesn't allow for those, so just save the no-op), no multi line
+   \yquant@for \i := #1 to #2 {%
+      \yquant@circuit@extendwire\i{center}%
+   }%
+   % no control line (init doesn't allow for those, so just save the no-op), no multi line
    % check for empty name parameter
    \ifstrempty{#5}\relax{%
       \pgfnodealias{\tikz@pp@name{#5}}{yquantbox}%
@@ -201,7 +353,85 @@
    \fi%
 }
 
-\newbox\yquant@draw@subcircuit@box
+\protected\long\def\yquant@draw@output@single#1#2{%
+   \let\idx=\yquant@draw@@idx@content%
+   \yquant@config@operator@multifalse%
+   \edef\cmd{%
+      \noexpand\path (\yquant@circuit@endwires@x, \yquant@register@get@y{#1})%
+         node[\ifnum\yquant@compat>1 /yquant/every operator,\fi%
+              /yquant/every output,%
+              /yquant/every \yquant@register@type@tostring{\yquant@register@get@type{#1}} output,%
+              \yquant@draw@@style, /yquant/this operator,%
+              name prefix=, name suffix=, name=yquantbox]%
+         {\unexpanded\expandafter{\yquant@draw@@content}};%
+      \ifdefined\yquant@parent%
+         \pgfshapeclippath{yquantbox}%
+                          {\ifnum\yquant@compat>1 /yquant/every operator,\fi%
+                           /yquant/every output,%
+                           /yquant/every \yquant@register@type@tostring{\yquant@register@get@type{#1}} output,%
+                           \yquant@draw@@style,%
+                           /yquant/this operator}%
+      \fi%
+   }%
+   \cmd%
+   % only extend for subcircuits
+   \ifdefined\yquant@parent%
+      \yquant@circuit@extendwire{#1}{center}%
+   \fi%
+   % check for empty name parameter
+   \ifstrempty{#2}\relax{%
+      \pgfnodealias{\tikz@pp@name{#2}}{yquantbox}%
+   }%
+   \numdef\yquant@draw@@idx@content{\yquant@draw@@idx@content+1}%
+}
+
+\protected\long\def\yquant@draw@output@multi#1#2#3#4#5{%
+   \let\idx=\yquant@draw@@idx@content%
+   \@tempdima=-.5\dimexpr\yquant@config@register@sep\relax%
+   \dimdef\yquant@draw@multiinit@@min{\yquant@register@get@y{#1}-\@tempdima}%
+   \dimdef\yquant@draw@multiinit@@max{\yquant@register@get@y{#2}+\@tempdima}%
+   \dimdef\yquant@draw@multiinit@@total{%
+      \yquant@draw@multiinit@@max-\yquant@draw@multiinit@@min%
+   }%
+   \def\pgfdecorationsegmentaspect{0}%
+   \let\yquant@register@multi@contiguous=\yquant@draw@multiinit@contiguous%
+   \let\pgfdecorationsegmentfromto=\empty%
+   #4%
+   \edef\pgfdecorationsegmentfromto{\expandafter\@gobble\pgfdecorationsegmentfromto}%
+   \yquant@config@operator@multitrue%
+   % We need to somehow extract the y radius
+   \edef\cmd{%
+      \noexpand\path (\yquant@circuit@endwires@x, \the\dimexpr.5\dimexpr%
+                         \yquant@draw@multiinit@@min+\yquant@draw@multiinit@@max\relax%
+                      \relax)%
+         node[\ifnum\yquant@compat>1 /yquant/every operator, /yquant/every output,\fi%
+              \yquant@draw@@style,%
+              \ifnum\yquant@compat<2 /yquant/every multi output,\fi%
+              /yquant/this operator,%
+              y radius=\yquant@abs{\the\dimexpr.5\dimexpr\yquant@draw@multiinit@@total\relax\relax},%
+              name prefix=, name suffix=, name=yquantbox]%
+            {\unexpanded\expandafter{\yquant@draw@@content}};%
+      \ifdefined\yquant@parent%
+         \pgfshapeclippath{yquantbox}%
+                          {\ifnum\yquant@compat>1 /yquant/every operator, /yquant/every output,\fi%
+                           \yquant@draw@@style,
+                           \ifnum\yquant@compat<2 /yquant/every multi output,\fi%
+                           /yquant/this operator}%
+      \fi%
+   }%
+   \cmd%
+   % only extend for subcircuits
+   \ifdefined\yquant@parent%
+      \yquant@for \i := #1 to #2 {%
+         \yquant@circuit@extendwire\i{center}%
+      }%
+   \fi%
+   % check for empty name parameter
+   \ifstrempty{#5}\relax{%
+      \pgfnodealias{\tikz@pp@name{#5}}{yquantbox}%
+   }%
+   \numdef\yquant@draw@@idx@content{\yquant@draw@@idx@content+1}%
+}
 
 \protected\def\yquant@draw@subcircuit@nodecallback#1{%
    \ifstrequal{#1}{yquantbox}\relax{%
@@ -209,65 +439,87 @@
    }%
 }
 
-\protected\long\def\yquant@draw@subcircuit@prepare#1#2{%
+% #1: id of subcircuit
+% #2: name
+% #3: {width of subcircuit (excluding outer box)}{including outer box}{left margin}
+% #4: affected wires
+\protected\long\def\yquant@draw@subcircuit@prepare#1#2#3#4{%
    \let\idx=\yquant@draw@@idx@content%
-   % In order to wrap the inner circuit in a proper box operator and clip outer paths appropriately (which was not possible yet, as we didn't know the exact vertical positions), we first place it within a box. During the setup time, we assumed that the subcircuit be placed at position #3; however, now, this has changed due to the additional box.
+   % In order to wrap the inner circuit in a proper box operator and clip outer paths appropriately (which was not possible yet, as we didn't know the exact vertical positions), we first place it within a box.
    % First, we anticipate the macro that is used by our subcircuit to store the node
    % names.
    \edef\yquant@draw@subcircuit@nodelist{yquant@env#1@draw@subcircuit@nodelist}%
    \global\cslet\yquant@draw@subcircuit@nodelist\empty%
-   \pgfinterruptboundingbox%
-      \let\yquant@parent=\yquant@prefix%
-      \def\yquant@prefix{yquant@env#1@}%
-      \ifstrempty{#2}{%
-         % we make sure there are no conflicts by prefixing any named nodes in any case.
-         \pgfkeys{/tikz/name prefix/.expanded={sub\yquant@prefix-}}%
-         \let\pgf@nodecallback=\yquant@draw@subcircuit@nodecallback%
-      }{%
-         \pgfkeys{/tikz/name prefix/.expanded={\pgfkeysvalueof{/tikz/name prefix}#2-}}%
+   % \pgfinterruptboundingbox, but just for y
+   \begingroup%
+      \edef\pgf@interrupt@savemaxy{\the\pgf@picmaxy}%
+      \edef\pgf@interrupt@saveminy{\the\pgf@picminy}%
+      \pgf@picmaxy=-16000pt %
+      \pgf@picminy=16000pt %
+      \pgf@size@hookedfalse%
+      \let\pgf@path@size@hook=\pgfutil@empty%
+      % now we must take care of extending all the wires appropriately until the beginning of the box. #3 contains width of this box, #4 contains registers affected by this box. Note that for subcircuits, x extension by the group is disabled.
+      \dimdef\newx{%
+         \yquant@draw@@x-.5\dimexpr\@secondofthree#3\relax%
       }%
-      \letcs\xmin{\yquant@prefix xmin}%
-      \letcs\xmax{\yquant@prefix xmax}%
-      \global\setbox\yquant@draw@subcircuit@box=\hbox to 0pt {{%
-         % bypass 'overlay' option
-         \pgf@relevantforpicturesizetrue%
-         \pgfsys@beginpicture%
-            % reset all styles to the expected defaults (similar, but extended to \pgfpicture, see pgf issue #870)
-            \pgfsetcolor{.}%
-            \pgfsetlinewidth{0.4pt}%
-            \pgfsetbuttcap%
-            \pgfsetmiterjoin%
-            \pgfsetmiterlimit{10}%
-            \pgfsetdash{}{0pt}%
-            % The left outer position of our box will be \yquant@draw@@x-.5(xmax-xmin).
-            % To compensate for, we perform a left shift of all commands that take explicit coordinates from the subcircuit.
-            % The y positions, on the other hand, are exactly the ones as they should be integrated in the picture.
-            \csdimdef{\yquant@prefix xshift}{\yquant@draw@@x-.5\dimexpr\xmax+\xmin\relax}%
-            \csname\yquant@prefix draw\endcsname%
-            \ifdim\pgf@picmaxx=-16000pt %
-               \global\pgf@picmaxx=0pt %
-               \global\pgf@picminx=0pt %
-               \global\pgf@picmaxy=0pt %
-               \global\pgf@picminy=0pt %
-            \fi%
-            \ifyquantdebug%
-               \pgf@relevantforpicturesizefalse%
-               \draw[green] (current bounding box.north east) rectangle (current bounding box.south west);%
-            \fi%
-         \pgfsys@endpicture%
+      \dimen0=\newx%
+      \let\yquant@draw@subcircuit@leftpos=\newx% seamless subcircuits: do not add another separation if we are there
+      \let\pgfshapeclippathhorzresult=\empty%
+      \forlistloop\yquant@draw@move@loop{#4}%
+      % but the new positions are not at the beginning of the box, but inside (with possible margin)
+      \dimdef\newx{%
+         \yquant@draw@@x-.5\dimexpr\@firstofthree#3\relax-\@thirdofthree#3%
+      }%
+      \forlistloop\yquant@draw@group@advance{#4}%
+      \setbox\yquant@prepare@subcircuit@box=\hbox{{%
+         \let\yquant@draw@subcircuit@wirestart=\newx%
+         \let\yquant@parent=\yquant@prefix%
+         \def\yquant@prefix{yquant@env#1@}%
+         \ifstrempty{#2}{%
+            % we make sure there are no conflicts by prefixing any named nodes in any case.
+            \pgfkeys{/tikz/name prefix/.expanded={sub\yquant@prefix-}}%
+            \let\pgf@nodecallback=\yquant@draw@subcircuit@nodecallback%
+         }{%
+            \pgfkeys{/tikz/name prefix/.expanded={\pgfkeysvalueof{/tikz/name prefix}#2-}}%
+         }%
+         \pgfkeys{/yquant/operators/this subcircuit box/.style={}}%
+         \edef\yquant@draw@subcircuit@style{%
+            /yquant/every operator, \yquant@draw@@style,%
+            /yquant/this operator, /yquant/internal/multi main=true,%
+         }
+         \expandafter\tikzset\expandafter{\yquant@draw@subcircuit@style}%
+         \csname\yquant@prefix draw\endcsname%
+         \dimen0=\yquant@register@get@y1\relax%
+         \ifdim\dimen0>\pgf@picmaxy %
+            \global\pgf@picmaxy=\dimen0 %
+         \fi%
+         \dimen0=\dimexpr\yquant@register@get@y{\csname\yquant@prefix registers\endcsname}\relax%
+         \ifdim\dimen0<\pgf@picminy %
+            \global\pgf@picminy=\dimen0 %
+         \fi%
       }}%
-      \global\setbox\yquant@draw@subcircuit@box=\hbox to \dimexpr\xmax-\xmin\relax {%
-         \hskip-\dimexpr\yquant@draw@@x-.5\dimexpr\xmax-\xmin\relax\relax%
-         \lower\pgf@picmaxy%
-         \box\yquant@draw@subcircuit@box%
+      \edef\cmd{%
+         \noexpand\path (\yquant@draw@@x, \the\dimexpr.5\pgf@picminy+.5\pgf@picmaxy\relax)%
+            node[/yquant/every operator, \yquant@draw@@style,%
+                 /yquant/operators/every subcircuit box, /yquant/this operator,%
+                 /yquant/operators/this subcircuit box,%
+                 /yquant/internal/multi main=true,%
+                 name prefix=, name suffix=, name=yquantbox]%
+            {\vbox to \the\dimexpr\pgf@picmaxy-\pgf@picminy\relax {\hbox to \@firstofthree#3 {}}};%
       }%
-      \ht\yquant@draw@subcircuit@box=0pt%
-      \dp\yquant@draw@subcircuit@box=\dimexpr\pgf@picmaxy-\pgf@picminy\relax%
-      \expandafter%
-   \endpgfinterruptboundingbox%
-   \expandafter\edef\expandafter\yquant@draw@subcircuit@y\expandafter{%
-      \the\dimexpr.5\pgf@picminy+.5\pgf@picmaxy\relax%
-   }%
+      \cmd%
+      \unhbox\yquant@prepare@subcircuit@box
+   % \endpgfinterruptboundingbox + increase
+      \ifdim\pgf@interrupt@savemaxy>\pgf@picmaxy%
+         \global\pgf@picmaxy=\pgf@interrupt@savemaxy%
+      \fi%
+      \ifdim\pgf@interrupt@saveminy<\pgf@picminy%
+         \global\pgf@picminy=\pgf@interrupt@saveminy%
+      \fi%
+   \endgroup%
+   % Now that the subcircuit is finished, we need advance all the wires
+   \dimdef\newx{\yquant@draw@@x+.5\dimexpr\yquant@draw@@width\relax}%
+   \forlistloop\yquant@draw@group@advance{#4}%
    \ifstrempty{#2}{%
       % However, if the outer node was not named, no access to the inner nodes is desired, so we delete all nodes again.
       \def\do##1{%
@@ -287,25 +539,21 @@
    }%
 }
 
-\protected\long\def\yquant@draw@subcircuit@single#1#2#3{%
-   \yquant@draw@subcircuit@prepare{#2}{#3}%
+\protected\long\def\yquant@draw@subcircuit@single#1#2#3#4{%
+   \yquant@config@operator@multifalse%
+   \yquant@draw@subcircuit@prepare{#2}{#3}{#4}{#1}%
    \edef\cmd{%
-      \noexpand\path (\yquant@draw@@x, \yquant@draw@subcircuit@y)%
-         node[/yquant/every operator, \yquant@draw@@style,%
-              /yquant/operators/every subcircuit box, /yquant/this operator,%
-              /yquant/operators/this subcircuit box,%
-              name prefix=, name suffix=, name=yquantbox]%
-         {\box\yquant@draw@subcircuit@box};%
-      \pgfshapeclippath{yquantbox}%
-                       {/yquant/every operator, \yquant@draw@@style,%
-                        /yquant/operators/every subcircuit box, /yquant/this operator,%
-                        /yquant/operators/this subcircuit box}%
+      \pgfshapeclippath{yquantbox}{%
+          /yquant/every operator, \yquant@draw@@style,%
+          /yquant/operators/every subcircuit box, /yquant/this operator,%
+          /yquant/operators/this subcircuit box,%
+      }%
    }%
    \cmd%
    % see comment in draw@subcircuit@multi
    \yquant@softpath@extractmaxxat\pgfshapeclippathhorzresult{\yquant@register@get@y{#1}}%
    \let\pgfshapeclippathhorzresult=\empty%
-   \yquant@circuit@extendwire{#1}{*}%
+   \yquant@circuit@extendwire{#1}*%
    \expandafter\yquant@circuit@extendcontrolline\expandafter%
       {\the\yquant@draw@@currentcontroltype}\yquant@draw@@x%
    % check for empty name parameter
@@ -315,31 +563,25 @@
    \numdef\yquant@draw@@idx@content{\yquant@draw@@idx@content+1}%
 }
 
-\protected\long\def\yquant@draw@subcircuit@multi#1#2#3#4#5#6{%
+\protected\long\def\yquant@draw@subcircuit@multi#1#2#3#4#5#6#7{%
+   \yquant@config@operator@multitrue%
    % there is no contiguous slicing for subcircuits, as they may have all kinds of wire operations that can extend beyond the individual slices, let alone ancillas
-   \yquant@draw@subcircuit@prepare{#5}{#6}%
-   % We need to somehow extract the y radius
+   \yquant@draw@subcircuit@prepare{#5}{#6}{#7}{#4}%
    \edef\cmd{%
-      \noexpand\path (\yquant@draw@@x, \yquant@draw@subcircuit@y)%
-         node[/yquant/every operator, \yquant@draw@@style,%
-              /yquant/operators/every subcircuit box, /yquant/this operator,%
-              /yquant/operators/this subcircuit box,
-              /yquant/operator/multi main=true,%
-              name prefix=, name suffix=, name=yquantbox]%
-            {\box\yquant@draw@subcircuit@box};%
-      \pgfshapeclippath{yquantbox}%
-                       {/yquant/every operator, \yquant@draw@@style,%
-                        /yquant/operators/every subcircuit box, /yquant/this operator,%
-                        /yquant/operators/this subcircuit box,%
-                        /yquant/operator/multi main=true}%
+      \pgfshapeclippath{yquantbox}{%
+          /yquant/every operator, \yquant@draw@@style,%
+          /yquant/operators/every subcircuit box, /yquant/this operator,%
+          /yquant/operators/this subcircuit box,%
+          /yquant/internal/multi main=true,%
+      }%
    }%
    \cmd%
    % install the clippings - but only on wires that are visually between the first and list while not being part of the circuit.
    \let\nonaffectedpgfshapeclippathhorzresult=\pgfshapeclippathhorzresult%
    \yquant@for \i := #1 to #2 {%
       \xifinlist{\i}{#4}{%
-         % Usually, we always begin with a wire from the center of the operator shape and clip the inner parts away. This can't be done here, as the wire needs to be drawn _inside_ of the outer box operator here. Instead of clipping against the clip path, we extract its maximum x position at the position of the wire (which is an overkill for simple shapes, but the allows to specify even more complicated ones) and place the wire at this position without clipping.
-         % Note: this works very well for lines joining at perpendicular angles; but if the shape of the box is more fancy, while the position will be calculated correctly, the wire has a rectangular (or rounded, depending on the line cap) shape that is drawn on top of thw operator. While \yquant@softpath@extractmaxxat could without much effort determine exactly the segment of the path that corresponds to the rightmost line, we would then have to convert this single line into a closed path that fills the linewidth and clip against it to get proper joiners. Since most likely, no-one will ever need this, we don't do it. But file a feature request if desired.
+         % Usually, we always begin with a wire from the center of the operator shape and clip the inner parts away. This can't be done here, as the wire needs to be drawn _inside_ of the outer box operator here. Instead of clipping against the clip path, we extract its maximum x position at the position of the wire (which is an overkill for simple shapes, but allows to specify even more complicated ones) and place the wire at this position without clipping.
+         % Note: this works very well for lines joining at perpendicular angles; but if the shape of the box is more fancy, while the position will be calculated correctly, the wire has a rectangular (or rounded, depending on the line cap) shape that is drawn on top of the operator. While \yquant@softpath@extractmaxxat could without much effort determine exactly the segment of the path that corresponds to the rightmost line, we would then have to convert this single line into a closed path that fills the linewidth and clip against it to get proper joiners. Since most likely, no-one will ever need this, we don't do it. But file a feature request if desired.
          \yquant@softpath@extractmaxxat\nonaffectedpgfshapeclippathhorzresult%
                                        {\yquant@register@get@y\i}%
          \let\pgfshapeclippathhorzresult=\empty%
@@ -465,7 +707,7 @@
          \ifx0#2%
             \edef\wirexpos{\expandafter\@secondoffour\wirelast}%
          \else%
-            \let\wirexpos=\yquant@env@end@xpos%
+            \let\wirexpos=\yquant@circuit@endwires@x%
          \fi%
          \ifdim\wirexpos>\wirexprevpos %
             \edef\wirestyle{\noexpand\tikzset{%
@@ -483,41 +725,52 @@
                }%
             }%
             \pgfscope%
-               % install the clipping
-               \pgfsyssoftpath@setcurrentpath\wireclipping%
-               % invert the clipping
-               \ifyquantdebug%
-                  \pgfsetfillcolor{orange}%
-                  \pgfsetfillopacity{.3}%
-                  \pgfusepathqfill%
-               \else%
-                  % We need to access the current bounding box as well as other positions in the local coordinate frame. For this, transform the bounding box to the current frame (though this is expensive). Does this capture rotations correctly?
-                  \begingroup%
-                     \pgftransforminvert%
-                     \pgfpointtransformednonlinear{\pgfqpoint{\pgf@picminx}{\pgf@picminy}}%
-                     \global\@tempdima=\pgf@y%
-                     \pgfpointtransformednonlinear{\pgfqpoint{\pgf@picmaxx}{\pgf@picmaxy}}%
-                     \global\@tempdimb=\pgf@y%
-                  \endgroup%
-                  % To avoid rendering artifacts at all zoom levels with all renderers, we need to make the clipping region large. Let's try the current bounding box first.
-                  % This may be insufficient if there no or a tiny wire label and only registers of a small height. In this case, take ten times the line width or at least 1cm, but don't let it affect the bounding box.
-                  \ifdim\dimexpr\@tempdimb-\@tempdima\relax<10\pgflinewidth %
-                     \@tempdima=\dimexpr\wireypos-5\pgflinewidth\relax%
-                     \@tempdimb=\dimexpr\wireypos+5\pgflinewidth\relax%
-                  \fi%
-                  \ifdim\dimexpr\@tempdimb-\@tempdima\relax<1cm %
-                     \@tempdima=\dimexpr\wireypos-5mm\relax%
-                     \@tempdimb=\dimexpr\wireypos+5mm\relax%
+               \unless\ifx\wireclipping\empty% may happen if the style is altered to be invisible, though the type is not none
+                  % install the clipping
+                  \pgfsyssoftpath@setcurrentpath\wireclipping%
+                  % invert the clipping
+                  \ifyquantdebug%
+                     \pgfsetfillcolor{orange}%
+                     \pgfsetfillopacity{.3}%
+                     \pgfusepathqfill%
+                  \else%
+                     % We need to access the current bounding box as well as other positions in the local coordinate frame. For this, transform the bounding box to the current frame (though this is expensive). Does this capture rotations correctly?
+                     \begingroup%
+                        \ifdim\pgf@picminx>\pgf@picmaxx%
+                           % nothing drawn yet (or bounding box reset)
+                           \pgf@picminx=0pt %
+                           \pgf@picmaxx=0pt %
+                        \fi%
+                        \ifdim\pgf@picminy>\pgf@picmaxy%
+                           \pgf@picminy=0pt %
+                           \pgf@picmaxy=0pt %
+                        \fi%
+                        \pgftransforminvert%
+                        \pgfpointtransformednonlinear{\pgfqpoint{\pgf@picminx}{\pgf@picminy}}%
+                        \global\@tempdima=\pgf@y%
+                        \pgfpointtransformednonlinear{\pgfqpoint{\pgf@picmaxx}{\pgf@picmaxy}}%
+                        \global\@tempdimb=\pgf@y%
+                     \endgroup%
+                     % To avoid rendering artifacts at all zoom levels with all renderers, we need to make the clipping region large. Let's try the current bounding box first.
+                     % This may be insufficient if there no or a tiny wire label and only registers of a small height. In this case, take ten times the line width or at least 1cm, but don't let it affect the bounding box.
+                     \ifdim\dimexpr\@tempdimb-\@tempdima\relax<10\pgflinewidth %
+                        \@tempdima=\dimexpr\wireypos-5\pgflinewidth\relax%
+                        \@tempdimb=\dimexpr\wireypos+5\pgflinewidth\relax%
+                     \fi%
+                     \ifdim\dimexpr\@tempdimb-\@tempdima\relax<1cm %
+                        \@tempdima=\dimexpr\wireypos-5mm\relax%
+                        \@tempdimb=\dimexpr\wireypos+5mm\relax%
+                     \fi%
+                     \pgf@relevantforpicturesizefalse%
+                        \pgfpathrectanglecorners%
+                           {\pgfqpoint{\dimexpr\wirexprevpos-2\pgflinewidth\relax}%
+                                      {\@tempdima}}%
+                           {\pgfqpoint{\dimexpr\wirexpos+2\pgflinewidth\relax}%
+                                      {\@tempdimb}}%
+                     \pgf@relevantforpicturesizetrue%
+                     \pgfseteorule% even-odd to properly invert the clipping
+                     \pgfusepathqclip%
                   \fi%
-                  \pgfinterruptboundingbox%
-                     \pgfpathrectanglecorners%
-                        {\pgfqpoint{\dimexpr\wirexprevpos-2\pgflinewidth\relax}%
-                                   {\@tempdima}}%
-                        {\pgfqpoint{\dimexpr\wirexpos+2\pgflinewidth\relax}%
-                                   {\@tempdimb}}%
-                  \endpgfinterruptboundingbox%
-                  \pgfseteorule% even-odd to properly invert the clipping
-                  \pgfusepathqclip%
                \fi%
                % the clip inversion is left to the drawing commands (clip two \pgflinewidth more to avoid renderer artifacts)
                \csname yquant@draw@wire@\wiretype\endcsname{#1}%
@@ -557,486 +810,17 @@
    \cmd%
 }
 
-\protected\long\def\yquant@draw@output@group#1{%
-   \begingroup%
-      \def\idx{0}%
-      \yquant@set{#1}%
-}
-
-\let\yquant@draw@output@endgroup=\endgroup%
-
-\protected\long\def\yquant@draw@output@single#1#2{%
-   \path%
-      (\yquant@env@end@xpos, \yquant@register@get@y{#1})%
-      node[/yquant/every output,%
-           /yquant/every \yquant@register@type@tostring{\yquant@register@get@type{#1}} output] {#2};
-   \numdef\idx{\idx+1}%
-}
-
-\protected\long\def\yquant@draw@output@multi#1#2#3#4{%
-   % extremely similar to \yquant@draw@multiinit
-   \@tempdima=-.5\dimexpr\yquant@config@register@sep\relax%
-   \dimdef\yquant@draw@multiinit@@min{\yquant@register@get@y{#1}-\@tempdima}%
-   \dimdef\yquant@draw@multiinit@@max{\yquant@register@get@y{#2}+\@tempdima}%
-   \dimdef\yquant@draw@multiinit@@total{%
-      \yquant@draw@multiinit@@max-\yquant@draw@multiinit@@min%
-   }%
-   \def\pgfdecorationsegmentaspect{0}%
-   \let\yquant@register@multi@contiguous=\yquant@draw@multiinit@contiguous%
-   \let\pgfdecorationsegmentfromto=\empty%
-   #3%
-   \edef\pgfdecorationsegmentfromto{\expandafter\@gobble\pgfdecorationsegmentfromto}%
-   \path[/yquant/every multi output]%
-      (\yquant@env@end@xpos, \yquant@draw@multiinit@@min) --%
-      (\yquant@env@end@xpos, \yquant@draw@multiinit@@max)%
-      node {#4};%
-   \numdef\idx{\idx+1}%
-}
-% END_FOLD
-
-% BEGIN_FOLD Preparation of drawing a generic shape
-% Most drawing operations will be realized through nodes
-\let\yquant@draw@callback@box=\@gobble
-\let\yquant@draw@callback@wire=\@gobble
-
-\def\yquant@draw@sort#1#2{%
-   \yquant@draw@sort@aux#1\relax#2\relax%
-      \expandafter\@firstoftwo%
-   \else%
-      \expandafter\@secondoftwo%
-   \fi%
-}
-
-\def\yquant@draw@sort@aux#1#2#3\relax#4#5#6\relax{%
-   \unless\ifnum#2>#5\relax%
-}
-
-% generic shape of an operator
-% #1: value
-% #2: tikz options that select the correct shape
-% #3: positive controls
-% #4: negative controls
-% #5: targets
-\protected\long\def\yquant@draw#1#2#3#4#5{%
-   % setup the required macros
-   \yquant@circuit@operator{#3}{#4}{#5}%
-   \yquant@draw@{#1}{#2}%
-}
-
-\protected\long\def\yquant@draw@#1#2{%
-   \yquant@sort@clear%
-   \def\idx{0}%
-   \dimen2=\yquant@config@operator@minimum@width%
-   % BEGIN_FOLD register
-   \def\do##1{%
-      \ifx\yquant@lang@attr@name\empty%
-         \let\nodename=\empty%
-      \else%
-         \edef\nodename{\yquant@lang@attr@name-\idx}%
-      \fi%
-      \ifyquant@firsttoken\yquant@register@multi{##1}{%
-         \yquant@draw@@multi{#1}{#2}{##1}%
-      }{%
-         \yquant@draw@@single{#1}{#2}{##1}%
-      }%
-         \ifx\yquant@draw@@multi\yquant@draw@@multiinit%
-            % if we draw an initialization (whether multi or single), this possibly affects the minimal x position. All other gates will be shifted so that they cannot extend beyond the minimal position.
-            \ifdim\pgf@picminx<\csname\yquant@prefix xmin\endcsname%
-               \csxdef{\yquant@prefix xmin}{\the\pgf@picminx}%
-            \fi%
-         \fi%
-         \expandafter%
-      \endpgfinterruptboundingbox%
-      \expandafter\dimen\expandafter0\expandafter=%
-         \the\dimexpr\pgf@picmaxx-\pgf@picminx\relax\relax%
-      \ifdim\dimen0>\dimen2 %
-         \dimen2=\dimen0 %
-      \fi%
-      \numdef\idx{\idx+1}%
-   }%
-   \dolistloop\yquant@circuit@operator@targets%
-   % END_FOLD
-   \yquant@draw@@controls%
-   \yquant@draw@@finalize{#1}{#2}%
-}
-
-\protected\def\yquant@draw@@controls@loop#1#2{%
-   \ifx\yquant@lang@attr@name\empty%
-      \let\nodename=\empty%
-   \else%
-      \edef\nodename{\yquant@lang@attr@name-#1\idx}%
-   \fi%
-   \yquant@sort@eadd{%
-      \expandafter\noexpand\csname yquant@draw@#1control\endcsname%
-         {#2}% register index
-         {\nodename}%
-   }%
-   \unless\ifdefined\yquant@draw@controltype%
-      \edef\yquant@draw@controltype{#2}%
-   \fi%
-   \numdef\idx{\idx+1}%
-}
-
-\protected\def\yquant@draw@@controls{%
-   \ifyquant@circuit@operator@hasControls%
-      \def\idx{0}%
-      \forlistloop{\yquant@draw@@controls@loop p}\yquant@circuit@operator@pctrls%
-      \def\idx{0}%
-      \forlistloop{\yquant@draw@@controls@loop n}\yquant@circuit@operator@nctrls%
-      \unless\ifdefined\yquant@draw@controltype%
-         \PackageError{yquant.sty}{Assertion failure}%
-                      {Internal inconsistency in yquant: Controlled action detected, but no controls were found.}%
-      \fi%
-   \fi%
-}
-
-\protected\long\def\yquant@draw@@finalize#1#2{%
-   % We now know the dimensions of all the registers (though we didn't bother with the height of the control knobs [if present], we just assume they are too small to change this).
-   \protected\def\idx{}%
-   \protected@edef\yquant@draw@append{%
-      \noexpand\yquant@draw@group%
-         {\the\dimexpr\yquant@circuit@operator@x+.5\dimen2\relax}% mid x position
-         \ifyquant@circuit@operator@hasControls%
-           \yquant@draw@controltype%
-         \else%
-           F%
-         \fi% if-switch whether controls are present
-         {\yquant@attrs@remaining}% custom style
-         {#2}% operator style
-         {#1}%
-   }%
-   \yquant@sort\yquant@draw@sort%
-   \advance \dimen2 by \yquant@circuit@operator@x\relax%
-   \ifyquant@circuit@operator@hasControls%
-      % If we draw a control line, all intermediate registers are affected in their position so that the line is never crossed. If the vertical line is instead caused by a multi register, \yquant@draw@@finalize@ctrl will be responsible for advancing only the affected positions.
-      \yquant@for \yquant@i := \yquant@circuit@operator@minctrl to \yquant@circuit@operator@maxctrl {%
-         \yquant@register@set@x\yquant@i{\the\dimen2}%
-      }%
-   \fi%
-   \def\do##1{%
-      \appto\yquant@draw@append{##1}%
-      \yquant@draw@@finalize@ctrl##1%
-   }%
-   \yquant@sort@dolistloop%
-   \csxappto{\yquant@prefix draw}{%
-      \unexpanded\expandafter{\yquant@draw@append}%
-      \noexpand\yquant@draw@endgroup%
-         \ifyquant@circuit@operator@hasControls%
-            T%
-         \else%
-            F%
-         \fi%
-         \ifx\yquant@lang@attr@name\empty%
-            {}0%
-         \else%
-            {\yquant@lang@attr@name}%
-            \ifnum\yquant@circuit@operator@numtarget=1 %
-               \ifnum\yquant@circuit@operator@numpctrl=1 %
-                  \ifnum\yquant@circuit@operator@numnctrl=1 %
-                     7%
-                  \else%
-                     6%
-                  \fi%
-               \else%
-                  \ifnum\yquant@circuit@operator@numnctrl=1 %
-                     5%
-                  \else%
-                     4%
-                  \fi%
-               \fi%
-            \else%
-               \ifnum\yquant@circuit@operator@numpctrl=1 %
-                  \ifnum\yquant@circuit@operator@numnctrl=1 %
-                     3%
-                  \else%
-                     2%
-                  \fi%
-               \else%
-                  \ifnum\yquant@circuit@operator@numnctrl=1 %
-                     1%
-                  \else%
-                     0%
-                  \fi%
-               \fi%
-            \fi%
-         \fi%
-   }%
-}
-
-\protected\def\yquant@draw@@single#1#2#3{%
-   \yquant@sort@eadd{%
-      \yquant@draw@single%
-         {#3}% register index
-         {\nodename}%
-   }%
-   % determine the actual dimensions by a virtual draw command
-   \pgfinterruptboundingbox%
-      \yquant@env@virtualize@path%
-      \path%
-         (0pt, 0pt)%
-         node[/yquant/every operator, #2, /yquant/this operator,%
-              name prefix=, name suffix=, name=] {#1};%
-      \yquant@register@update@height{#3}{\the\pgf@picmaxy}%
-      \yquant@register@update@depth{#3}{\the\dimexpr-\pgf@picminy\relax}%
-}
-
-\protected\def\yquant@draw@@multi#1#2#3{%
-   \yquant@sort@eadd{%
-      \yquant@draw@multi%
-         #3%
-         {\nodename}%
-   }%
-   % Determining the actual height is a problem - where to store its value? If there are single-register parts, we update the height accordingly; else we just assume that there is always enough space for such a control, since it anyways already spans multiple registers. (TODO?)
-   \pgfinterruptboundingbox%
-      \yquant@env@virtualize@path%
-      \def\yquant@draw@@content{#1}%
-      \def\yquant@draw@@style{#2}%
-      \let\yquant@register@multi@contiguous=\yquant@draw@@multi@contiguous%
-      \@fifthoffive#3%
-      \ifdim\pgf@picmaxy=-16000pt %
-         % if there was no single contiguous part before, determine the width now
-         \path%
-            (0pt, 0pt)%
-            node[/yquant/every operator, #2, /yquant/this operator,%
-                 name prefix=, name suffix=, name=] {#1};%
-      \fi%
-}
-
-\protected\def\yquant@draw@@multi@contiguous#1#2#3{%
-   \ifnum#1=#2 %
-      % we only care about single-register parts
-      \global\pgf@picmaxy=-16000pt %
-      \global\pgf@picminy=16000pt %
-      \edef\cmd{%
-         \noexpand\path (0pt, 0pt)%
-            node[/yquant/every operator, \yquant@draw@@style, /yquant/this operator,%
-                 /yquant/operator/multi main=\ifnum#3=1 true\else false\fi,%
-                 name prefix=, name suffix=, name=]%
-               {\unexpanded\expandafter{\yquant@draw@@content}};%
-      }%
-      \cmd%
-      \yquant@register@update@height{#1}{\the\pgf@picmaxy}%
-      \yquant@register@update@depth{#1}{\the\dimexpr-\pgf@picminy\relax}%
-   \fi%
-}
-
-\protected\def\yquant@draw@@multiinit#1#2#3{%
-   \yquant@sort@eadd{%
-      \yquant@draw@multiinit%
-         #3%
-         {\nodename}%
-   }%
-   % Determining the actual height is a problem - where to store its value? We just assume that there is always enough space for such a control, since it anyway already spans multiple registers. (TODO?)
-   \pgfinterruptboundingbox%
-      \yquant@env@virtualize@path%
-      \path%
-         (0pt, 0pt)%
-         node[/yquant/every operator, #2, /yquant/every multi label,%
-              name prefix=, name suffix=, name=] {#1};%
-}
-
-\protected\long\def\yquant@draw@@subcircuit#1{%
-   \yquant@sort@clear%
-   \def\idx{0}%
-   \dimen2=\yquant@config@operator@minimum@width%
-   % BEGIN_FOLD register
-   \def\do##1{%
-      \ifx\yquant@lang@attr@name\empty%
-         \let\nodename=\empty%
-      \else%
-         \edef\nodename{\yquant@lang@attr@name-\idx}%
-      \fi%
-      \ifyquant@firsttoken\yquant@register@multi{##1}{%
-         \yquant@draw@@subcircuit@multi{#1}{##1}%
-      }{%
-         \yquant@draw@@subcircuit@single{#1}{##1}%
-      }%
-      \dimen0=\dimexpr%
-         \csname yquant@env\yquant@circuit@subcircuit@id @xmax\endcsname-%
-         \csname yquant@env\yquant@circuit@subcircuit@id @xmin\endcsname%
-      \relax\relax%
-      \pgfinterruptboundingbox%
-         % There will still be some extra width taken by separations or other things related to the box itself.
-         \yquant@env@virtualize@path%
-         \path%
-            (0pt, 0pt)%
-            node[/yquant/every operator, #1,%
-                 /yquant/operators/every subcircuit box, /yquant/this operator,%
-                 /yquant/operators/this subcircuit box,%
-                 name prefix=, name suffix=, name=]%
-            {\hbox to \dimen0{}};%
-         % We also don't update the height here, as the height of the subcircuit is undetermined as long as we did not match inner and outer wires.
-         \expandafter%
-      \endpgfinterruptboundingbox%
-      \expandafter\dimen\expandafter0\expandafter=%
-         \the\dimexpr\pgf@picmaxx-\pgf@picminx\relax\relax%
-      \ifdim\dimen0>\dimen2 %
-         \dimen2=\dimen0 %
-      \fi%
-      \numdef\idx{\idx+1}%
-   }%
-   \dolistloop\yquant@circuit@operator@targets%
-   % END_FOLD
-   \yquant@draw@@controls%
-   \yquant@draw@@finalize{}{#1}%
-}
-
-\protected\def\yquant@draw@@subcircuit@single#1#2{%
-   \edef\yquant@circuit@subcircuit@param{#2\yquant@list@delim}%
-   \yquant@circuit@subcircuit{#1}%
-   \yquant@sort@eadd{%
-      \yquant@draw@subcircuit@single%
-         {#2}% register index
-         {\yquant@circuit@subcircuit@id}%
-         {\nodename}%
-   }%
-}
-
-\protected\def\yquant@draw@@subcircuit@multi#1#2{%
-   \edef\yquant@circuit@subcircuit@param{\@fifthoffive#2}%
-   \yquant@sort@list\yquant@circuit@subcircuit@param\yquant@sort@ascending%
-   \yquant@circuit@subcircuit{#1}%
-   \yquant@sort@eadd{%
-      \yquant@draw@subcircuit@multi%
-         #2%
-         {\yquant@circuit@subcircuit@id}%
-         {\nodename}%
-   }
-}
-
-\protected\long\def\yquant@draw@@output@single#1#2{%
-   \path
-      (\yquant@env@end@xpos, 0pt)%
-      node[/yquant/every output,%
-           /yquant/every \yquant@register@type@tostring{\yquant@register@get@type{#1}} output] {#2};%
-   \numdef\idx{\idx+1}%
-}
-
-\protected\long\def\yquant@draw@@output@multi#1{%
-   \path[/yquant/every multi output]%
-      (\yquant@env@end@xpos, 0pt) -- (\yquant@env@end@xpos, 1cm)%
-      node {#1};%
-   \numdef\idx{\idx+1}%
-}
-
-\def\yquant@draw@@finalize@ctrl#1{%
-   \let\next=\yquant@draw@@finalize@ctrl@single%
-   \ifx\yquant@draw@multi#1%
-      \let\next=\yquant@draw@@finalize@ctrl@multi%
-   \else%
-      \ifx\yquant@draw@multiinit#1%
-         \let\next=\yquant@draw@@finalize@ctrl@multi%
-      \else%
-         \ifx\yquant@draw@subcircuit@multi#1%
-            \let\next=\yquant@draw@@finalize@ctrl@subcircuit@multi%
-         \else%
-            \ifx\yquant@draw@subcircuit@single#1%
-               \let\next=\yquant@draw@@finalize@ctrl@subcircuit@single%
-            \fi%
-         \fi%
-      \fi%
-   \fi%
-   \next%
-}
-
-\protected\def\yquant@draw@@finalize@ctrl@single#1#2{%
-   \unless\ifyquant@circuit@operator@hasControls%
-      \yquant@register@set@x{#1}{\the\dimen2}%
-   \fi%
-   \eappto\yquant@draw@append{%
-      \yquant@draw@callback@wire{#1}%
-   }%
-}
-
-\def\yquant@draw@@finalize@ctrl@subcircuit@single#1#2#3{%
-   \yquant@draw@@finalize@ctrl@single{#1}{#3}%
-}
-
-\protected\def\yquant@draw@@finalize@ctrl@singleinit#1#2{%
-   \eappto\yquant@draw@append{%
-      \yquant@draw@callback@wire{#1}%
-   }%
-}
-
-\protected\def\yquant@draw@@finalize@ctrl@multi#1#2#3#4#5{%
-   \unless\ifyquant@circuit@operator@hasControls{%
-      % \yquant@for uses \loop...\repeat and hence redefines \body, which would destroy an outer loop.
-      % if we did not draw a control line, the x position has not yet been set. A multi-qubit register might visually extend over multiple registers that are not even part, hence we update them all.
-      \yquant@for \yquant@i := #1 to #2 {%
-         \yquant@register@set@x\yquant@i{\the\dimen2}%
-      }%
-   }\fi%
-   \let\yquant@register@multi@contiguous=\yquant@draw@@finalize@ctrl@multi@contiguous%
-   \ifyquant@circuit@operator@hasControls%
-      \ifyquant@config@operator@multi@warn%
-         \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{0}%
-      \else%
-         \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{2}%
-      \fi%
-   \else%
-      \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{2}%
-   \fi%
-   \cslet{\yquant@prefix finalize@ctrl@draw@appto}\empty%
-   #4%
-   \eappto\yquant@draw@append{\csname\yquant@prefix finalize@ctrl@draw@appto\endcsname}%
-   \csgundef{\yquant@prefix finalize@ctrl@draw@appto}%
-}
-
-\protected\def\yquant@draw@@finalize@ctrl@subcircuit@multi@loop#1{%
+\protected\def\yquant@draw@hspace#1#2{%
    \begingroup%
-      \edef\tmp{\yquant@draw@callback@wire{#1}}%
-      \expandafter%
+      \yquant@register@get@maxxlist\newx{#1}%
+      \dimdef\newx{\newx+#2}%
+      \dimen0=\newx%
+      \let\pgfshapeclippathhorzresult=\empty%
+      \forlistloop\yquant@draw@move@loop{#1}%
    \endgroup%
-   \expandafter\appto\expandafter\yquant@draw@append\expandafter{\tmp}%
 }
 
-\protected\def\yquant@draw@@finalize@ctrl@subcircuit@multi#1#2#3#4#5#6{%
-   % there are no contiguous parts here, don't call the normal @multi
-   \unless\ifyquant@circuit@operator@hasControls{%
-      % \yquant@for uses \loop...\repeat and hence redefines \body, which would destroy an outer loop.
-      % if we did not draw a control line, the x position has not yet been set. A multi-qubit register might visually extend over multiple registers that are not even part, hence we update them all.
-      \yquant@for \yquant@i := #1 to #2 {%
-         \yquant@register@set@x\yquant@i{\the\dimen2}%
-      }%
-   }\fi%
-   \forlistloop\yquant@draw@@finalize@ctrl@subcircuit@multi@loop{#4}%
-}
-
-\protected\def\yquant@draw@@finalize@ctrl@multiinit#1#2#3#4#5{%
-   % this is called from a do loop itself, so preserve \do (but do not enter grouping)
-   \let\yquant@register@multi@contiguous=\yquant@draw@@finalize@ctrl@multi@contiguous%
-   \ifyquant@circuit@operator@hasControls%
-      \ifyquant@config@operator@multi@warn%
-         \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{0}%
-      \else%
-         \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{2}%
-      \fi%
-   \else%
-      \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{2}%
-   \fi%
-   \cslet{\yquant@prefix finalize@ctrl@draw@appto}\empty%
-   #4%
-   \eappto\yquant@draw@append{\csname\yquant@prefix finalize@ctrl@draw@appto\endcsname}%
-   \csgundef{\yquant@prefix finalize@ctrl@draw@appto}%
-}
-
-\protected\def\yquant@draw@@finalize@ctrl@multi@contiguous#1#2#3{%
-   \ifnum\yquant@draw@@finalize@ctrl@multi@contiguous@warn=1 %
-      \PackageWarning{yquant.sty}{Ambiguous operation: multiple discontiguous multi-register operations in combination with controls make it hard to visually determine on which registers the gates act on.}%
-      % switch the warning off for this group (which is a single operation)
-      \yquant@config@operator@multi@warnfalse%
-      \def\yquant@draw@@finalize@ctrl@multi@contiguous@warn{2}%
-   \else%
-      \numdef\yquant@draw@@finalize@ctrl@multi@contiguous@warn{%
-         \yquant@draw@@finalize@ctrl@multi@contiguous@warn+1%
-      }%
-   \fi%
-   {% save \body
-      \yquant@for \yquant@i := #1 to #2 {{% let inner loop mess up with macros
-         \csxappto{\yquant@prefix finalize@ctrl@draw@appto}{%
-            \expandafter\yquant@draw@callback@wire\expandafter{\yquant@i}%
-         }%
-      }}%
-   }%
-}
-% END_FOLD
\ No newline at end of file
+\protected\def\yquant@draw@move@loop#1{%
+   \yquant@register@set@x{#1}\newx%
+   \yquant@circuit@extendwire{#1}*%
+}
\ No newline at end of file