From 0c5873595e7802d33b614f9d6890d47da5ffb5cf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 28 Dec 2019 22:30:34 +0000 Subject: kvmap (26dec19) git-svn-id: svn://tug.org/texlive/trunk@53249 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/kvmap/kvmap.pdf | Bin 112188 -> 108264 bytes Master/texmf-dist/source/latex/kvmap/kvmap.dtx | 16 +++++++++------- Master/texmf-dist/source/latex/kvmap/kvmap.ins | 2 +- Master/texmf-dist/tex/latex/kvmap/kvmap.sty | 7 +++---- 4 files changed, 13 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/kvmap/kvmap.pdf b/Master/texmf-dist/doc/latex/kvmap/kvmap.pdf index 751ca928758..2325b051146 100644 Binary files a/Master/texmf-dist/doc/latex/kvmap/kvmap.pdf and b/Master/texmf-dist/doc/latex/kvmap/kvmap.pdf differ diff --git a/Master/texmf-dist/source/latex/kvmap/kvmap.dtx b/Master/texmf-dist/source/latex/kvmap/kvmap.dtx index 94a9728bde0..efa6b2e481d 100644 --- a/Master/texmf-dist/source/latex/kvmap/kvmap.dtx +++ b/Master/texmf-dist/source/latex/kvmap/kvmap.dtx @@ -1,5 +1,5 @@ % \iffalse meta-comment -% This is kvmap, (c) 2018 Ben Frank +% This is kvmap, (c) 2019 Ben Frank % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -15,7 +15,7 @@ \input l3docstrip.tex \askforoverwritefalse \preamble -Copyright (C) 2018 Ben Frank +Copyright (C) 2019 Ben Frank It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of @@ -60,7 +60,7 @@ End of file doclang/new={\textcolor{DarkGreen}{\textbf{\textsf{N}}}}, doclang/updated={\textcolor{DarkGreen}{\textbf{\textsf{U}}}}, minted options={linenos,xleftmargin=8.75pt,breaklines=true, - breakanywhere,fontsize=\small,escapeinside=§§,autogobble=false}} + breakanywhere,fontsize=\small,escapeinside=§§,autogobble=false}} \tcbset{enhanced,sharp corners=all} \usemintedstyle{vs} @@ -102,7 +102,7 @@ End of file %<*pkg> %<@@=kvmap> \RequirePackage{expl3} -\ProvidesExplPackage{kvmap}{2018/09/20}{0.3.1}{Drawing karnaugh maps with LaTeX} +\ProvidesExplPackage{kvmap}{2019/12/26}{0.3.2}{Drawing karnaugh maps with LaTeX} % % \fi % @@ -402,6 +402,7 @@ End of file % \end{macrocode} % \end{macro} % \begin{macro}[int]{\@@_outputmatrix:n} +% \changes{v0.3.2}{2019/12/26}{Allow empty elements} % Define a TikZ style for easier customizability. % \begin{macrocode} \tikzset{kvnode/.style = { inner ~ sep = 8pt }} @@ -419,9 +420,10 @@ End of file % \begin{macrocode} \int_zero:N \l_tmpa_int % \end{macrocode} -% Use a temporary sequence to store the argument. +% Use a temporary sequence to store the argument. This has to be a split because +% setting from clist would eliminate empty elements. % \begin{macrocode} - \seq_set_from_clist:Nn \l_tmpa_seq { #1 } + \seq_set_split:Nnn \l_tmpa_seq { , } { #1 } % \end{macrocode} % Loop over the elements of the list. Every element will be output as node % where $x = \text{counter}\mod\text{width}$ and @@ -719,6 +721,7 @@ End of file % \end{macrocode} % \end{macro} % \begin{environment}{kvmatrix} +% \changes{v0.3.2}{2019/12/26}{Count empty columns} % This environment enables a |tabular|-like input syntax. % \begin{arguments} % \item labels (variables) @@ -740,7 +743,6 @@ End of file \seq_set_split:Nno \l_tmpa_seq { \\ } { \BODY } \seq_remove_all:Nn \l_tmpa_seq { } \seq_set_split:Nnx \l_tmpb_seq { & } { \seq_item:Nn \l_tmpa_seq { 1 } } - \seq_remove_all:Nn \l_tmpb_seq { } \int_gset:Nn \l_@@_matrix_width_int { \seq_count:N \l_tmpb_seq } \int_gset:Nn \l_@@_matrix_height_int { \seq_count:N \l_tmpa_seq } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/kvmap/kvmap.ins b/Master/texmf-dist/source/latex/kvmap/kvmap.ins index f01204b3767..57689e0fce1 100644 --- a/Master/texmf-dist/source/latex/kvmap/kvmap.ins +++ b/Master/texmf-dist/source/latex/kvmap/kvmap.ins @@ -1,7 +1,7 @@ \input l3docstrip.tex \askforoverwritefalse \preamble -Copyright (C) 2018 Ben Frank +Copyright (C) 2019 Ben Frank It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/kvmap/kvmap.sty b/Master/texmf-dist/tex/latex/kvmap/kvmap.sty index 128f338aad1..4a736e96c11 100644 --- a/Master/texmf-dist/tex/latex/kvmap/kvmap.sty +++ b/Master/texmf-dist/tex/latex/kvmap/kvmap.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% kvmap.dtx (with options: `pkg,cfg') -%% Copyright (C) 2018 Ben Frank +%% Copyright (C) 2019 Ben Frank %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of @@ -15,7 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% \RequirePackage{expl3} -\ProvidesExplPackage{kvmap}{2018/09/20}{0.3.1}{Drawing karnaugh maps with LaTeX} +\ProvidesExplPackage{kvmap}{2019/12/26}{0.3.2}{Drawing karnaugh maps with LaTeX} \RequirePackage{xparse} \RequirePackage{tikz} \RequirePackage{environ} @@ -71,7 +71,7 @@ \cs_new:Npn \__kvmap_outputmatrix:n #1 { \int_zero:N \l_tmpa_int -\seq_set_from_clist:Nn \l_tmpa_seq { #1 } +\seq_set_split:Nnn \l_tmpa_seq { , } { #1 } \seq_map_inline:Nn \l_tmpa_seq { \node[kvnode] ~ @@ -266,7 +266,6 @@ yshift=\l__kvmap_bundle_reducespace_dim] \seq_set_split:Nno \l_tmpa_seq { \\ } { \BODY } \seq_remove_all:Nn \l_tmpa_seq { } \seq_set_split:Nnx \l_tmpb_seq { & } { \seq_item:Nn \l_tmpa_seq { 1 } } -\seq_remove_all:Nn \l_tmpb_seq { } \int_gset:Nn \l__kvmap_matrix_width_int { \seq_count:N \l_tmpb_seq } \int_gset:Nn \l__kvmap_matrix_height_int { \seq_count:N \l_tmpa_seq } \seq_clear:N \l__kvmap_tmp_seq -- cgit v1.2.3