From 211895cb70356b872e7b8a50cb89dd0755138f27 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 8 May 2021 21:05:57 +0000 Subject: tikz-cd (8may21) git-svn-id: svn://tug.org/texlive/trunk@59133 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tikz-cd/README.md | 5 +- .../texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.pdf | Bin 266756 -> 271313 bytes .../texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.tex | 88 ++++++++++----------- .../tex/generic/tikz-cd/tikzlibrarycd.code.tex | 27 ++++--- Master/texmf-dist/tex/latex/tikz-cd/tikz-cd.sty | 31 ++++---- 5 files changed, 76 insertions(+), 75 deletions(-) diff --git a/Master/texmf-dist/doc/latex/tikz-cd/README.md b/Master/texmf-dist/doc/latex/tikz-cd/README.md index b988d1dc069..ab41cbf387f 100644 --- a/Master/texmf-dist/doc/latex/tikz-cd/README.md +++ b/Master/texmf-dist/doc/latex/tikz-cd/README.md @@ -9,8 +9,9 @@ reasonable default settings. It can be used in plain TeX, LaTeX and ConTeXt. See [the manual][tikz-cd-doc] for further details and many examples. -This software is distributed under the terms of the GNU General Public -License, version 3 or later. +This work may be distributed and/or modified under the conditions of +the LaTeX Project Public License, either version 1.3 of this license +or (at your option) any later version. [pgf]: https://ctan.org/pkg/pgf [tikz-cd-doc]: http://mirrors.ctan.org/graphics/pgf/contrib/tikz-cd/tikz-cd-doc.pdf diff --git a/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.pdf b/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.pdf index e4f8c8d40d0..ca9fe5486f7 100644 Binary files a/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.pdf and b/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.tex b/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.tex index b2e6cd6652e..436307f3a28 100644 --- a/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.tex +++ b/Master/texmf-dist/doc/latex/tikz-cd/tikz-cd-doc.tex @@ -1,17 +1,20 @@ -% Copyright 2011, 2012, 2014, 2018 by Augusto Stoffel +%% tikz-cd-doc.tex +%% Copyright 2011, 2012, 2014, 2018, 2021 Augusto Stoffel % -% This program is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. % -% This program is distributed in the hope that it will be useful, -% 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. +% This work has the LPPL maintenance status `maintained'. % -% You should have received a copy of the GNU General Public License -% along with this program. If not, see . +% The Current Maintainer of this work is Augusto Stoffel. +% +% This work consists of the files tikzlibrarycd.code.tex, tikz-cd.sty +% and tikz-cd-doc.tex. % % ------------------------------------------------------------------------ % @@ -179,7 +182,7 @@ directory}{}} {\Large\bfseries Commutative diagrams with \tikzname} \vspace{1em} -{Version 0.9f \qquad November 19, 2018} +{Version 1.0 \qquad May 4, 2021} \end{center} \vspace{1.5em} @@ -191,28 +194,16 @@ reasonable default settings. Familiarity with Ti\emph{k}Z is helpful but not necessary, since the examples contained here cover the most common situations. -This software is distributed under the terms of the GNU General Public -License, version 3 or later. +This work may be distributed and/or modified under the conditions of +the \LaTeX\ Project Public License, either version 1.3 of this license +or (at your option) any later version. \tableofcontents -\setcounter{section}{-1} -\section{Disclaimer} -\label{sec:disclaimer} - -Before version 1.0 of this package is released, minor modifications -and bug fixes may be performed. All documents making an orthodox use -of this package will continue to compile and generate essentially the -same output. However, if you have strict stability requirements (for -instance, if you want to assure no page break changes will happen in -your documents), keep a copy of the current version of the file -\texttt{tikzlibrarycd.code.tex} in your document's directory. - \section{Getting started} \label{sec:basic-usage} -To invoke this package in \LaTeX, type - +To load this package in \LaTeX, type \begin{verse} \index{tikz-cd@\protect\texttt{tikz-cd} package}% \index{Packages and files!tikz-cd@\protect\texttt{tikz-cd}}% @@ -224,6 +215,8 @@ or load \tikzname{} and then type \index{Libraries!cd@\protect\texttt{cd}}% |\usetikzlibrary{cd}|% \end{verse} +This package is compatible with other \TeX\ formats as well. +See~\S\ref{sec:usage-plain-tex} and \S\ref{sec:usage-context}. \subsection{Creating a diagram} \label{sec:creating-diagrams} @@ -291,14 +284,21 @@ Similarly, a label can receive additional options via the syntax Both \meta{label text} and \meta{label options} need to be enclosed in curly braces if they contain commas. +{\catcode`\|=12 \begin{codeexample}[] \begin{tikzcd} A \arrow[r, "\phi"] \arrow[d, red] & B \arrow[d, "\psi" red] \\ C \arrow[r, red, "\eta" blue] - & D + & |[blue, rotate=-15]| D \end{tikzcd} \end{codeexample} +} + +The example above also showcases one of the possible ways to pass +special options to a \tikzname\ matrix node. See the \pgfname{} +manual \cite[\S\ref*{pgfman-section-matrices}]{pgfman} for more +information. Arrows can have an arbitrary number of labels, by repeated use of arguments in quotes. The example below shows how to control the @@ -508,7 +508,7 @@ and the other ones work analogously. \subsection{Usage in plain \TeX{}} \label{sec:usage-plain-tex} -To use this software in plain \TeX{}, load \tikzname{} and the +To use this package in plain \TeX{}, load \tikzname{} and the \texttt{cd} library by saying \begin{verse} |\input tikz.tex|\\ @@ -523,9 +523,9 @@ All other functions of this library work as described in this manual without change. \subsection{Usage in Con\TeX t} -\label{sec:usage-plain-context} +\label{sec:usage-context} -To use this software in Con\TeX t, load \tikzname{} and then the +To use this package in Con\TeX t, load \tikzname{} and then the \texttt{cd} library by saying \begin{verse} |\usemodule[tikz]|\\ @@ -632,7 +632,7 @@ it. \def\printsep#1#2{\edef\temp{\pgfkeysvalueof{/tikz/commutative diagrams/#1 sep/#2}}\expandafter\printsepaux\temp} \begin{key}{/tikz/commutative diagrams/row sep=\meta{size}} - This key acts as a ``frontend'' to \tikzname's |/tikz/row sep| key. If + This key acts as a frontend to \tikzname's |/tikz/row sep| key. If the key \begin{verse} |/tikz/commutative diagrams/row sep/|\meta{size} @@ -1103,7 +1103,7 @@ defining |\arrow| and its relatives, as well as applying the default settings specified by |every diagram| and its relatives. Note that the next-row command |\\| for the last row is inserted by |{tikzcd}|, and therefore should not be present in \meta{contents}. Notice also -that you can use the key |execute at end picuture| in \meta{options} +that you can use the key |execute at end picture| in \meta{options} to have arbitrary \tikzname{} code executed after a diagram is drawn. Initially, \meta{paths} is the empty string. A command @@ -1167,11 +1167,10 @@ be inserted. If you find that this package is not flexible enough for some particular application, you can use the methods described in -\cite{lenders}, \cite{milne} and draw diagrams directly with -\tikzname. In this case, you can still use the styles provided here -to obtain pictures with a uniform appearance throughout your document. -The pictures below show how this can be done (the second one is -adapted from \cite{milne}). +\cite{milne} and draw diagrams directly with \tikzname. In this case, +you can still use the styles provided here to obtain pictures with a +uniform appearance throughout your document. The pictures below show +how this can be done (the second one is adapted from \cite{milne}). \begin{codeexample}[] \begin{tikzpicture}[commutative diagrams/every diagram] @@ -1228,7 +1227,7 @@ An alternative fix to this issue that does not require replacing |&| with a different column separator consists in adding the following line to your document after all packages have been loaded: \begin{verse} - |\def\temp{&} \catcode`&=\active \let&=\temp| + |\def\temp{&} \catcode`&=||\active \let&=||\temp| \end{verse} However, this may interfere in unexpected ways with other packages. Use this trick at your own risk. @@ -1426,17 +1425,13 @@ stem makes certain assumptions about the font design and could fail in cases where unusual design choices are made. \begin{thebibliography}{9} -\bibitem{lenders} - Felix Lenders, - \emph{Commutative diagrams using \tikzname}. - Available at \url{http://www.felixl.de/commu.pdf}. \bibitem{milne} James Milne, \emph{Guide to commutative diagrams}. Available at \url{http://www.jmilne.org/not/CDGuide.html}. \bibitem{pgfman} Till Tantau, - \emph{The \tikzname{} and \pgfname{} packages: Manual for version 3.0.1a}. + \emph{The \tikzname{} and \pgfname{} packages: Manual for version 3.1.9}. Available at \url{http://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf}. \end{thebibliography} @@ -1447,4 +1442,5 @@ cases where unusual design choices are made. %%% Local Variables: %%% mode: tex %%% mode: auto-fill -%%% End: \ No newline at end of file +%%% TeX-engine: luatex +%%% End: diff --git a/Master/texmf-dist/tex/generic/tikz-cd/tikzlibrarycd.code.tex b/Master/texmf-dist/tex/generic/tikz-cd/tikzlibrarycd.code.tex index 1879a235a72..660b49a17f3 100644 --- a/Master/texmf-dist/tex/generic/tikz-cd/tikzlibrarycd.code.tex +++ b/Master/texmf-dist/tex/generic/tikz-cd/tikzlibrarycd.code.tex @@ -1,19 +1,20 @@ -% tikzlibrarycd.code.tex [2018/11/19 v0.9f Commutative diagrams with TikZ] +%% tikzlibrarycd.code.tex [2021/05/04 v1.0 Commutative diagrams with TikZ] +%% Copyright 2011, 2012, 2014, 2018, 2021 Augusto Stoffel % -% Copyright 2011, 2012, 2014, 2018 by Augusto Stoffel +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. % -% This program is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% This work has the LPPL maintenance status `maintained'. % -% This program is distributed in the hope that it will be useful, -% 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 . +% The Current Maintainer of this work is Augusto Stoffel. +% +% This work consists of the files tikzlibrarycd.code.tex, tikz-cd.sty +% and tikz-cd-doc.tex. \usetikzlibrary{matrix,quotes,arrows.meta} diff --git a/Master/texmf-dist/tex/latex/tikz-cd/tikz-cd.sty b/Master/texmf-dist/tex/latex/tikz-cd/tikz-cd.sty index 00837096e48..441bfd8f500 100644 --- a/Master/texmf-dist/tex/latex/tikz-cd/tikz-cd.sty +++ b/Master/texmf-dist/tex/latex/tikz-cd/tikz-cd.sty @@ -1,19 +1,22 @@ -% Copyright 2011, 2012, 2014, 2018 by Augusto Stoffel +%% tikz-cd.sty +%% Copyright 2011, 2012, 2014, 2018, 2021 Augusto Stoffel % -% This program is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. - -% This program is distributed in the hope that it will be useful, -% 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 . +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Augusto Stoffel. +% +% This work consists of the files tikzlibrarycd.code.tex, tikz-cd.sty +% and tikz-cd-doc.tex. -\ProvidesPackage{tikz-cd}[2018/11/19 v0.9f Commutative diagrams with TikZ] +\ProvidesPackage{tikz-cd}[2021/05/04 v1.0 Commutative diagrams with TikZ] \RequirePackage{tikz}[2013/12/13] % pgf version 3.0.0 required \usetikzlibrary{cd} -- cgit v1.2.3