Skip to content

allows use of tikzcd inside tikzpicture as scope #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kpym wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allows use of tikzcd inside tikzpicture as scope #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions tikzlibrarycd.code.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
% but WITHOUT ANY WARRANTY; without even the implied warranty of
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% GNU General Public License for more details.
%
%
% You should have received a copy of the GNU General Public License
% along with this program. If not, see <http://www.gnu.org/licenses/>.

Expand All @@ -22,6 +22,7 @@
\def\tikzcdset{\pgfqkeys{/tikz/commutative diagrams}}

\tikzcdset{
name/.style={/tikz/every matrix/.append style={name=#1}},
arrows/.code={\tikzcdset{every arrow/.append style={#1}}},
labels/.code={\tikzcdset{every label/.append style={#1}}},
cells/.code={\tikzcdset{every cell/.append style={#1}}},
Expand Down Expand Up @@ -85,7 +86,7 @@
}{%
\def#1{\tikzcdmatrixname-#2}%
}}

% The unknown key handler and direction argument parser
\tikzcdset{
.unknown/.code={%
Expand Down Expand Up @@ -124,7 +125,12 @@
\def\tikzcd@@{\pgfutil@ifnextchar[{\tikzcd@handle@shortcuts@next\tikzcd@}{\tikzcd@[]}}

\def\tikzcd@[#1]{%
\tikzpicture[/tikz/commutative diagrams/.cd,every diagram,#1]%
\tikzifinpicture{%
\let\tikzcdpicture\scope\let\endtikzcdpicture\endscope% <-- inside tikzpicture : start a scope
}{%
\let\tikzcdpicture\tikzpicture\let\endtikzcdpicture\endtikzpicture% <-- outside tikzpicture : start a tikzpicture
}%
\tikzcdpicture[/tikz/commutative diagrams/.cd,every diagram,#1]%
\ifx\arrow\tikzcd@arrow%
\pgfutil@packageerror{tikz-cd}{Diagrams cannot be nested}{}%
\fi%
Expand Down Expand Up @@ -162,7 +168,7 @@
\tikzcd@before@paths@hook%
\tikzcd@savedpaths%
\endgroup%
\endtikzpicture%
\endtikzcdpicture%
\ifnum0=`{}\fi}

% The arrow commands
Expand Down