diff options
Diffstat (limited to 'macros/latex/contrib')
| -rw-r--r-- | macros/latex/contrib/kvmap/DEPENDS.txt | 4 | ||||
| -rw-r--r-- | macros/latex/contrib/kvmap/README.md | 2 | ||||
| -rw-r--r-- | macros/latex/contrib/kvmap/kvmap.dtx | 31 | ||||
| -rw-r--r-- | macros/latex/contrib/kvmap/kvmap.pdf | bin | 110023 -> 96808 bytes | |||
| -rw-r--r-- | macros/latex/contrib/multicolrule/mcrule-examples.pdf | bin | 50874 -> 61063 bytes | |||
| -rw-r--r-- | macros/latex/contrib/multicolrule/mcrule-examples.tex | 27 | ||||
| -rw-r--r-- | macros/latex/contrib/multicolrule/multicolrule.dtx | 42 | ||||
| -rw-r--r-- | macros/latex/contrib/multicolrule/multicolrule.pdf | bin | 561243 -> 519743 bytes |
8 files changed, 74 insertions, 32 deletions
diff --git a/macros/latex/contrib/kvmap/DEPENDS.txt b/macros/latex/contrib/kvmap/DEPENDS.txt new file mode 100644 index 0000000000..cc089feab1 --- /dev/null +++ b/macros/latex/contrib/kvmap/DEPENDS.txt @@ -0,0 +1,4 @@ +expl3 +amsmath +xparse +pgf # tikz but the CTAN name as requested in the DEPENDS.txt spec is pgf diff --git a/macros/latex/contrib/kvmap/README.md b/macros/latex/contrib/kvmap/README.md index 6dcefd6da8..a774dd7ef1 100644 --- a/macros/latex/contrib/kvmap/README.md +++ b/macros/latex/contrib/kvmap/README.md @@ -1,4 +1,4 @@ -# The `kvmap` package +# The `kvmap` package v0.3.5 This LaTeX package allows the creation of (even large) Karnaugh maps. It provides a tabular-like input syntax and support for drawing bundles diff --git a/macros/latex/contrib/kvmap/kvmap.dtx b/macros/latex/contrib/kvmap/kvmap.dtx index 1c7bb4008d..2adb0fbaa3 100644 --- a/macros/latex/contrib/kvmap/kvmap.dtx +++ b/macros/latex/contrib/kvmap/kvmap.dtx @@ -64,6 +64,12 @@ End of file \tcbset{enhanced,sharp corners=all} \usemintedstyle{vs} +^^A quick fix for tcolorbox's broken documentation library +^^A by Skillmon, see https://chat.stackexchange.com/transcript/message/55558127#55558127 +\makeatletter +\let\tcb@doc@index@doc\relax +\makeatother + \usepackage{fontspec} \usepackage{unicode-math} \setmainfont[Numbers={OldStyle}]{Libertinus Serif} @@ -102,7 +108,7 @@ End of file %<*pkg> %<@@=kvmap> \RequirePackage{expl3} -\ProvidesExplPackage{kvmap}{2020/04/25}{0.3.4}{Drawing karnaugh maps with LaTeX} +\ProvidesExplPackage{kvmap}{2020/09/16}{0.3.5}{Drawing karnaugh maps with LaTeX} %</pkg> % \fi % @@ -133,8 +139,8 @@ End of file % \section{Introduction} % \pkg{kvmap} aims to provide a \emph{user-friendly} (i.e. less typing) way to % typeset Karnaugh maps including the surrounding gray code and bundles of -% cells (implicants). This package relies on \pkg{xparse} (with \pkg{expl3}), -% \pkg{tikz} and \pkg{environ}.\par +% cells (implicants). This package relies on \pkg{amsmath}, \pkg{xparse} (with +% \pkg{expl3}) and \pkg{tikz}.\par % Drawing Karnaugh maps is not that uncommon and there are already packages % available on CTAN that provide means to typeset them:\begin{itemize} % \item \pkg{askmaps} -- This package lets you draw American style Karnaugh @@ -291,17 +297,18 @@ End of file % \end{documentation} % \begin{implementation} % \clearpage\section{Implementation} +% \changes{v0.3.5}{2020/09/16}{Add amsmath dependency to have smash option b available} % \begin{macrocode} +\RequirePackage{amsmath} \RequirePackage{xparse} \RequirePackage{tikz} -\RequirePackage{environ} % \end{macrocode} -% \begin{macro}[aux]{\seq_set_split:Nno,\seq_set_split:Nnx,\int_mod:VV,\int_div_truncate:VV} +% \begin{macro}[aux]{\seq_set_split:Nnx,\int_mod:VV,\int_div_truncate:VV} % Define variants for better expansion. % \begin{macrocode} -\cs_generate_variant:Nn \seq_set_split:Nnn { Nno, Nnx } -\cs_generate_variant:Nn \int_mod:nn { VV } -\cs_generate_variant:Nn \int_div_truncate:nn { VV } +\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx } +\cs_generate_variant:Nn \int_mod:nn { VV } +\cs_generate_variant:Nn \int_div_truncate:nn { VV } % \end{macrocode} % \end{macro} @@ -753,14 +760,14 @@ End of file % \end{macrocode} % \end{variable} % \begin{macrocode} -\NewEnviron { kvmatrix } [ 1 ] +\NewDocumentEnvironment { kvmatrix } { m +b } { % \end{macrocode} % Split the environments body at |\\| and remove empty lines. Now the height % of the map is just the count of the sequence. Split the first element at |&| % and use the count of that as width. % \begin{macrocode} - \seq_set_split:Nno \l_tmpa_seq { \\ } { \BODY } + \seq_set_split:Nnn \l_tmpa_seq { \\ } { #2 } \seq_remove_all:Nn \l_tmpa_seq { } \seq_set_split:Nnx \l_tmpb_seq { & } { \seq_item:Nn \l_tmpa_seq { 1 } } \int_gset:Nn \l_@@_matrix_width_int { \seq_count:N \l_tmpb_seq } @@ -790,7 +797,7 @@ End of file { #1 } \bool_if:NF \l_@@_matrix_isintikz_bool { \end{tikzpicture} } - } + } { } % \end{macrocode} % \end{environment} @@ -809,6 +816,6 @@ End of file % \end{macro} % \end{implementation} % \clearpage\PrintChanges -% \clearpage\PrintIndex +% ^^A\clearpage\PrintIndex % \Finale % \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/kvmap/kvmap.pdf b/macros/latex/contrib/kvmap/kvmap.pdf Binary files differindex eb66731d6b..3624e9dede 100644 --- a/macros/latex/contrib/kvmap/kvmap.pdf +++ b/macros/latex/contrib/kvmap/kvmap.pdf diff --git a/macros/latex/contrib/multicolrule/mcrule-examples.pdf b/macros/latex/contrib/multicolrule/mcrule-examples.pdf Binary files differindex 7a4237a86e..8ec88d4bae 100644 --- a/macros/latex/contrib/multicolrule/mcrule-examples.pdf +++ b/macros/latex/contrib/multicolrule/mcrule-examples.pdf diff --git a/macros/latex/contrib/multicolrule/mcrule-examples.tex b/macros/latex/contrib/multicolrule/mcrule-examples.tex index 3796b78e32..4d00ba53bb 100644 --- a/macros/latex/contrib/multicolrule/mcrule-examples.tex +++ b/macros/latex/contrib/multicolrule/mcrule-examples.tex @@ -8,7 +8,7 @@ \usepackage{bbding} \usepackage{pgfornament} \usepackage{bidi} -\usetikzlibrary{calc} +\usetikzlibrary{math,calc} \setlength{\columnsep}{24pt} \setlength{\columnseprule}{.5pt} \begin{document} @@ -164,7 +164,7 @@ for instructions on how to set them in your own documents. \lipsum[1-2] \end{multicols} -\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule] +\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule\footnote{Based on an answer to tex.stackexchange question 47828}] \SetMCRule{color=gray,width=0.4pt, expand=2pt, custom-line={ \coordinate (TOPLEFT) at ($(TOP)-(\columnwidth+.5\columnsep,\columnseprule)$); \coordinate (TOPRIGHT) at ($(TOP)+(\columnwidth+.5\columnsep,-\columnseprule)$); @@ -175,6 +175,29 @@ for instructions on how to set them in your own documents. \lipsum[1-2] \end{multicols} +\setlength{\columnsep}{2in} + +\begin{multicols}{2}[Notepad image between two columns\footnote{Based on an answer to tex.stackexchange question 522305}] + \SetMCRule{color=blue!10,width=2pt, custom-line={ + \tikzmath {coordinate \t, \b; + \t = (TOP)-(.45\columnsep,0); + integer \r, \s; + \r = \ty / 16; + \s = \ty - \r*16; + \t = (\t)-(0,.5*\s); + \b = (\t)+(.9\columnsep,-\r*16); + } + \draw [line width=\columnseprule] + (\t) -- ++(.9\columnsep,0) -- (\b) -- ++(-.9\columnsep,0) -- cycle; + \foreach \fila in {1,...,\r} + { + \draw [line width=\columnseprule] + ($(\t)-(0,\fila*16pt)$) -- ++(0.90\columnsep,0); + } + }} + \lipsum[1-2] +\end{multicols} + \subsection*{Extended Rules} \setlength{\columnsep}{24pt} diff --git a/macros/latex/contrib/multicolrule/multicolrule.dtx b/macros/latex/contrib/multicolrule/multicolrule.dtx index ac6d017a18..33c04e76a5 100644 --- a/macros/latex/contrib/multicolrule/multicolrule.dtx +++ b/macros/latex/contrib/multicolrule/multicolrule.dtx @@ -54,7 +54,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2018-2019 by Karl Hagen <latex@polysyllabic.com> +Copyright (C) 2018-2020 by Karl Hagen <latex@polysyllabic.com> This file may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -276,11 +276,10 @@ and the derived files multicolrule.ins, % or the \LaTeX{} kernel, depending on the mode of operation. If \pkg{bidi} is % loaded, it will also patch that. It will have no effect if you use a class or % package that outputs column text via alternate mechanisms. This includes -% \pkg{parcolumns}, and probably other classes and packages designed to typeset -% parallel-column text as well, although I have not done a survey to determine -% whether this is the case. If you would like support for one of these, please -% send me an email or file a feature request on github and I'll see what I can -% do. +% \pkg{parcolumns}, \pkg{paracol}, and probably any other class that does its +% own multi-column formatting. If you would like support for one of these, +% please send me an email or file a feature request on github and I'll see what +% I can do. % % The line styles that work by repeating elements in a tiled pattern may have % significant gaps at the end of columns, particularly for larger patterns. @@ -302,7 +301,7 @@ and the derived files multicolrule.ins, % \begin{multicols}{2}[\subsection{License}] % \SetMCRule{width=ultra-thick,line-style=dotted} % The\stydsc{\texttt{line-style=dotted, width=ultra-thick}} \mcrule{} -% package is copyright 2018--2019 by Karl Hagen. It may be distributed and/or +% package is copyright 2018--2020 by Karl Hagen. It may be distributed and/or % modified under the conditions of the \LaTeX{} Project Public License, either % version 1.3c of this license or (at your option) any later version. The % latest version of this license is in @@ -333,12 +332,12 @@ and the derived files multicolrule.ins, % others look better with it. The default behavior of \mcrule{} depends on the % status of the \pkg{tikz} package at the time \mcrule{} is loaded. If % \mcrule{} detects that \pkg{tikz} is already loaded, then tikz support will -% be enabled by default. Otherwise, you need the \opt{tikz} to enable it. This -% option also accepts explicit boolean values, so you can pass |tikz=false| if -% you want to explicitly disable tikz support. If tikz support is not enabled -% (or if it is explicitly disabled), the line styles marked \emph{tikz only} -% in section \ref{sec:linestyles} will be unavailable and errors will result -% if you try to use them. +% be enabled by default. Otherwise, you need to provide the \opt{tikz} option +% to enable it. This option also accepts explicit boolean values, so you can +% pass |tikz=false| if you want to explicitly disable tikz support. If tikz +% support is not enabled (or if it is explicitly disabled), the line styles +% marked \emph{tikz only} in section \ref{sec:linestyles} will be unavailable +% and errors will result if you try to use them. % % \subsection{Option `twocolumn'} % \DescribeOption{twocolumn} @@ -380,7 +379,7 @@ and the derived files multicolrule.ins, % a page unless you close out one \env{multicols} environment and begin another. % % Table \ref{table:mcrulekeys} summarizes the keys available in \cs{SetMCRule}. -% The functions of each is described in detail in the sections that follow. +% The functions of each are described in detail in the sections that follow. % \end{multicols} % % \begin{longtable}{lp{3.5in}} @@ -569,7 +568,7 @@ and the derived files multicolrule.ins, % % The rule in this section uses the \cs{SparkleBold} symbol from % \pkg{bbding}. Notice that when you use the \kvdesc{custom-tile} parameter, -% of any of the other custom key commands, you do \emph{not} specify a separate +% or any of the other custom key commands, you do \emph{not} specify a separate % \kvdesc{line-style}. If you try to provide both, the last style given in the % list will be the one that is kept. % \end{multicols} @@ -891,7 +890,7 @@ and the derived files multicolrule.ins, %\subsection{Preliminaries} % % \begin{macrocode} -\ProvidesExplPackage {multicolrule} {2019/10/01} {1.3} +\ProvidesExplPackage {multicolrule} {2020/09/14} {1.3a} {Decorative vertical rules between columns} % \end{macrocode} % @@ -922,6 +921,7 @@ and the derived files multicolrule.ins, % \begin{macrocode} \bool_new:N \g_@@_twocolumn_bool \bool_new:N \g_@@_use_tikz_bool +\bool_new:N \g_@@_paracol_bool % \end{macrocode} %\end{variable} % @@ -987,8 +987,11 @@ and the derived files multicolrule.ins, \keys_define:nn {mcrule-opts} { twocolumn .bool_gset:N = \g_@@_twocolumn_bool, + twocolumn .default:n = true, tikz .bool_gset:N = \g_@@_use_tikz_bool, tikz .default:n = true, + paracol .bool_gset:N = \g_@@_paracol_bool, + paracol .default:n = true, } \ProcessKeysOptions{mcrule-opts} % \end{macrocode} @@ -1102,9 +1105,10 @@ and the derived files multicolrule.ins, % after \pkg{xcolor}, \pkg{tikz}, \emph{and} \pkg{multicol}, so it must always % be loaded after us. We use \cs{AfterPackage} from \pkg{scrlfile} to insert % the patch if \pkg{bidi} is loaded later on. +% \changes{v1.3a}{2020/9/14}{Update scrlfile command because of API change in that package.} % % \begin{macrocode} - \AfterPackage!{bidi} + \AfterAtEndOfPackage*{bidi} { \@@_patch_twocol_output:N \RTL@outputdblcol \@@_patch_twocol_output:N \LTR@outputdblcol @@ -1771,6 +1775,10 @@ and the derived files multicolrule.ins, % \end{macrocode} %\end{macro} % +% \begin{macrocode} +%</package> +% \end{macrocode} +% %\end{implementation} % % \PrintChanges diff --git a/macros/latex/contrib/multicolrule/multicolrule.pdf b/macros/latex/contrib/multicolrule/multicolrule.pdf Binary files differindex 9571400c97..acb3d123be 100644 --- a/macros/latex/contrib/multicolrule/multicolrule.pdf +++ b/macros/latex/contrib/multicolrule/multicolrule.pdf |