Fix vertical alignment with multiple subcircuits

Previously, they might cancel out each other in very particular and unpredictable circumstances - but now, we'll possibly need more resources.
projekter · Jan 22, 2023 · 4a2384a · 4a2384a
1 parent ffee786
commit 4a2384a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/doc/latex/yquant/yquant-doc.pdf b/doc/latex/yquant/yquant-doc.pdf
diff --git a/doc/latex/yquant/yquant-doc.tex b/doc/latex/yquant/yquant-doc.tex
@@ -5357,5 +5357,6 @@
 
       \subsection*{2023-01-21: Version 0.7.3}
          Fix \href{https://github.com/projekter/yquant/issues/24}{\#24}: Clipping in subcircuits can under very special circumstances fail. Change all clipping paths to a most conservative huge rectangle---before, we tried to be economical.
+         Also use a more meticulous way of subcircuit position alignment (which will probably consume more resources during compilation, but multiple subcircuits may cancel each other in height and depth calculation if we don't do it).
 %END_FOLD
 \end{document}
diff --git a/tex/latex/yquant/yquant-env.tex b/tex/latex/yquant/yquant-env.tex
@@ -259,17 +259,9 @@
       \listremove\noexpand\redolist{#1}%
       \expandafter\noexpand\csname yquant@env@end@calcypositions@#1@\i\endcsname%
       \expandafter\unless\expandafter\ifx\csname\yquant@prefix subcircuits\endcsname\empty%
-         \ifinlist{#1}\noexpand\redolist{%
-            \noexpand\forlistloop%
-               \yquant@env@end@calcypositions@run%
-               \expandafter\noexpand\csname\yquant@prefix subcircuits\endcsname%
-         }{%
-            \noexpand\ifyquant@env@end@calcypositions@godeep%
-               \noexpand\forlistloop%
-                  \yquant@env@end@calcypositions@run%
-                  \expandafter\noexpand\csname\yquant@prefix subcircuits\endcsname%
-            \noexpand\fi%
-         }%
+         \noexpand\forlistloop%
+            \yquant@env@end@calcypositions@run%
+            \expandafter\noexpand\csname\yquant@prefix subcircuits\endcsname%
       \fi%
    }%
    % END_FOLD
@@ -416,8 +408,20 @@
    \csname yquant@env@end@calcypositions@#1\endcsname%
 }
 
+\protected\def\yquant@env@end@calcypositions@redo@min#1{%
+   \ifnum#1<\redoitem\space %
+      \def\redoitem{#1}%
+   \fi%
+}
+
 \protected\def\yquant@env@end@calcypositions@redo{%
-   \forlistloop\yquant@env@end@calcypositions@run\redolist%
+   % instead of looping through the list, we only check the lowest item - since running it may actually remove some other items from the list. Note that the lowest item is not necessarily the outermost, but for sure the topmost wire that should be redone is contained in it.
+   \unless\ifx\redolist\empty%
+      \def\redoitem{2147483647}%
+      \forlistloop\yquant@env@end@calcypositions@redo@min\redolist%
+      % this will automatically remove the item from the list
+      \expandafter\yquant@env@end@calcypositions@run\expandafter{\redoitem}%
+   \fi%
    \unless\ifx\redolist\empty%
       \expandafter\yquant@env@end@calcypositions@redo%
    \fi%