From 7a82689ba1c07aced1fac2c02a632b6d0853c5df Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 13 Jul 2017 23:08:44 +0000 Subject: elzcards (10jul17) git-svn-id: svn://tug.org/texlive/trunk@44785 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/elzcards/elzcards.sty | 135 +++++++++++++--------- 1 file changed, 79 insertions(+), 56 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/elzcards/elzcards.sty b/Master/texmf-dist/tex/latex/elzcards/elzcards.sty index cd73ddea302..4c44bbb4d28 100644 --- a/Master/texmf-dist/tex/latex/elzcards/elzcards.sty +++ b/Master/texmf-dist/tex/latex/elzcards/elzcards.sty @@ -6,7 +6,7 @@ %% %% elzcards.dtx (with options: `package') %% -%% Copyright 2015 Emilio Lazo Zaia +%% Copyright 2017 Emilio Lazo Zaia %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -24,18 +24,21 @@ %% %% This work consists of the files README and elzcards.dtx with %% its derived files elzcards.ins, elzcards.sty and -%% elzcards-example.tex. +%% elzcards-examples.tex. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{elzcards}[2015/04/26 v1.20 ELZ cards] +\ProvidesPackage{elzcards}[2017/07/09 v1.23 ELZ cards] \RequirePackage{calc} \RequirePackage{xparse} \RequirePackage{keyval} +\RequirePackage[usenames,dvipsnames]{xcolor} -\newif\if@elzc@guias +\newif\if@elzc@cruces +\newif\if@elzc@segmentos \newif\if@elzc@puntos \newif\if@elzc@lineas +\newif\if@elzc@sinmarcas \newif\if@elzc@tarjeta \newif\if@elzc@tarjetaconreverso \newif\if@elzc@fichaconreverso @@ -84,6 +87,17 @@ \newcounter{elzc@TempFichaActualRev} \newcounter{elzc@TempInfo} +\def\elzc@aux@cruces{% + \@elzc@crucestrue\@elzc@segmentostrue\@elzc@puntosfalse\@elzc@lineasfalse\@elzc@sinmarcasfalse} +\def\elzc@aux@segmentos{% + \@elzc@crucesfalse\@elzc@segmentostrue\@elzc@puntosfalse\@elzc@lineasfalse\@elzc@sinmarcasfalse} +\def\elzc@aux@puntos{% + \@elzc@crucesfalse\@elzc@segmentosfalse\@elzc@puntostrue\@elzc@lineasfalse\@elzc@sinmarcasfalse} +\def\elzc@aux@lineas{% + \@elzc@crucesfalse\@elzc@segmentosfalse\@elzc@puntosfalse\@elzc@lineastrue\@elzc@sinmarcasfalse} +\def\elzc@aux@sinmarcas{% + \@elzc@crucesfalse\@elzc@segmentosfalse\@elzc@puntosfalse\@elzc@lineasfalse\@elzc@sinmarcastrue} + \define@key{ELZc}{hsize}{\setlength{\elzc@TarjXdim}{#1}} \define@key{ELZc}{vsize}{\setlength{\elzc@TarjYdim}{#1}} \define@key{ELZc}{hgap}{\setlength{\elzc@SeparaX}{#1}} @@ -92,41 +106,36 @@ \setlength{\elzc@TempLen}{#1}\setcounter{elzc@Arista}{\elzc@TempLen}} \define@key{ELZc}{dot size}{\setlength{\elzc@TempLen}{#1}\setcounter{elzc@Punto}{\elzc@TempLen}} \define@key{ELZc}{line thickness}{\linethickness{#1}} -\define@key{ELZc}{crosses}[true]{\@elzc@guiastrue\@elzc@puntosfalse\@elzc@lineasfalse} -\define@key{ELZc}{dots}[true]{\@elzc@guiasfalse\@elzc@puntostrue\@elzc@lineasfalse} -\define@key{ELZc}{lines}[true]{\@elzc@guiasfalse\@elzc@puntosfalse\@elzc@lineastrue} +\define@key{ELZc}{crosses}[true]{\elzc@aux@cruces} +\define@key{ELZc}{segments}[true]{\elzc@aux@segmentos} +\define@key{ELZc}{dots}[true]{\elzc@aux@puntos} +\define@key{ELZc}{lines}[true]{\elzc@aux@lineas} +\define@key{ELZc}{crop color}{\def\elzc@ColorMarcas{#1}} +\define@key{ELZc}{no marks}[true]{\elzc@aux@sinmarcas} \newcommand*{\CurrentIC}{\arabic{elzc@FichaActual}} -\let\CurrentFC\CurrentIC - \newcommand*{\TotalIC}{\arabic{elzc@Fichas}} +\let\CurrentFC\CurrentIC \let\TotalFC\TotalIC \newcommand*{\BCdim}[2]{\setlength{\elzc@DefTPXdim}{#1}\setlength{\elzc@DefTPYdim}{#2}} - \newcommand*{\ICdim}[2]{\setlength{\elzc@DefFichaXdim}{#1}\setlength{\elzc@DefFichaYdim}{#2}} \let\FCdim\ICdim -\NewDocumentCommand{\BCgap}{m g}{% +\NewDocumentCommand{\CardGap}{m g}{% \setlength{\elzc@DefSeparaX}{#1}% - \IfValueTF{#2}{\setlength{\elzc@DefSeparaY}{#2}}{\setlength{\elzc@DefSeparaY}{#1}}}% -\let\ICgap\BCgap -\let\FCgap\BCgap - -\newcommand*{\CrossSegment}[1]{\setlength{\elzc@DefArista}{#1}} + \IfValueTF{#2}{\setlength{\elzc@DefSeparaY}{#2}}{\setlength{\elzc@DefSeparaY}{#1}}} +\newcommand*{\SegmentLength}[1]{\setlength{\elzc@DefArista}{#1}} \newcommand*{\DotSize}[1]{\setlength{\elzc@DefPunto}{#1}} - \newcommand*{\LineThickness}[1]{\setlength{\elzc@DefLinea}{#1}} -\newcommand*{\CropDots}{% - \def\elzc@DefMarcasCorte{\@elzc@guiasfalse\@elzc@puntostrue\@elzc@lineasfalse}} - -\newcommand*{\CropCrosses}{% - \def\elzc@DefMarcasCorte{\@elzc@guiastrue\@elzc@puntosfalse\@elzc@lineasfalse}} - -\newcommand*{\CropLines}{% - \def\elzc@DefMarcasCorte{\@elzc@guiasfalse\@elzc@puntosfalse\@elzc@lineastrue}} +\newcommand*{\CropCrosses}{\def\elzc@DefMarcasCorte{\elzc@aux@cruces}} +\newcommand*{\CropSegments}{\def\elzc@DefMarcasCorte{\elzc@aux@segmentos}} +\newcommand*{\CropDots}{\def\elzc@DefMarcasCorte{\elzc@aux@puntos}} +\newcommand*{\CropLines}{\def\elzc@DefMarcasCorte{\elzc@aux@lineas}} +\newcommand*{\CropColor}[1]{\def\elzc@DefColorMarcas{#1}} +\newcommand*{\NoCropMarks}{\def\elzc@DefMarcasCorte{\elzc@aux@sinmarcas}} \NewDocumentCommand{\MakeBC}{s o}{% \ifx\undefined\@elzc@TarjetaAnverso @@ -143,7 +152,7 @@ \fi} \NewDocumentCommand{\MakeIC}{s o}{% - \ifnum \value{elzc@Fichas} = 0 + \ifnum \value{elzc@Fichas} = 0% \PackageError{elzcards}{There are no index/flash cards in stack}{}% \else \@elzc@tarjetafalse @@ -158,12 +167,16 @@ \let\MakeFC\MakeIC \NewDocumentCommand{\BusinessCard}{+m +o}{% - \def\@elzc@TarjetaAnverso{#1}% - \IfValueTF{#2}{% - \@elzc@tarjetaconreversotrue - \def\@elzc@TarjetaReverso{#2}% - \immediate\write\@auxout{\string\@twosidetrue\string\@mparswitchtrue}} - {\def\@elzc@TarjetaReverso{}}} + \ifx\undefined\@elzc@TarjetaAnverso + \def\@elzc@TarjetaAnverso{#1}% + \IfValueTF{#2}{% + \@elzc@tarjetaconreversotrue + \def\@elzc@TarjetaReverso{#2}% + \immediate\write\@auxout{\string\@twosidetrue\string\@mparswitchtrue}} + {\def\@elzc@TarjetaReverso{}} + \else + \PackageError{elzcards}{There are business cards already defined}{}% + \fi} \NewDocumentCommand{\IndexCard}{+m +o}{% \addtocounter{elzc@Fichas}{1}% @@ -211,7 +224,7 @@ \setcounter{elzc@NumXY}{\value{elzc@NumX} * \value{elzc@NumY}}% \setcounter{elzc@ContX}{-1}% \setcounter{elzc@ContY}{-1}% - \setcounter{elzc@RestoX}{- \value{elzc@PapelX} + \value{elzc@NumX} * + \setcounter{elzc@RestoX}{- \value{elzc@PapelX} + \value{elzc@NumX} *% (\value{elzc@TarjXdim} + \value{elzc@SeparaX}) - \value{elzc@SeparaX}}% \elzc@Informacion \begin{picture}(\value{elzc@PapelX}, \value{elzc@PapelY})(\value{elzc@XInicial}, 0)% @@ -266,7 +279,7 @@ \else \setcounter{elzc@TempFichaActualRev}{0}% \ifnum\value{elzc@FichaActual} < \value{elzc@Fichas}% - \elzc@Tarjetas% + \elzc@Tarjetas \fi \setcounter{elzc@FichaActual}{0}% \fi @@ -286,7 +299,8 @@ \setlength{\elzc@SeparaY}{\elzc@DefSeparaY}% \setlength{\elzc@TempLen}{\elzc@DefArista}\setcounter{elzc@Arista}{\elzc@TempLen}% \setlength{\elzc@TempLen}{\elzc@DefPunto}\setcounter{elzc@Punto}{\elzc@TempLen}% - \linethickness{\elzc@DefLinea}} + \linethickness{\elzc@DefLinea}% + \let\elzc@ColorMarcas\elzc@DefColorMarcas} \newcommand*{\elzc@CalculaMarcas}{% \setcounter{elzc@TempMarcaX}{\value{elzc@PosX}}% @@ -325,40 +339,40 @@ \newcommand*{\elzc@DibujaMarcas}[2]{% \ifnum \value{elzc@ContX} = 0% - \if@elzc@guias\put(#1,#2){\line(-1,0){\value{elzc@Arista}}}\fi - \if@elzc@puntos\put(#1,#2){\circle*{\value{elzc@Punto}}}\fi + \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(-1,0){\value{elzc@Arista}}}\fi + \if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi \else \ifnum \value{elzc@ContX} = \value{elzc@NumX}% - \if@elzc@guias\put(#1,#2){\line(2,0){\value{elzc@Arista}}}\fi - \if@elzc@puntos\put(#1,#2){\circle*{\value{elzc@Punto}}}\fi + \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(2,0){\value{elzc@Arista}}}\fi + \if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi \else - \if@elzc@guias - \put(#1,#2){\line(-1,0){\value{elzc@Arista}}}% - \put(#1,#2){\line(2,0){\value{elzc@Arista}}}% + \if@elzc@cruces + \put(#1,#2){\color{\elzc@ColorMarcas}\line(-1,0){\value{elzc@Arista}}}% + \put(#1,#2){\color{\elzc@ColorMarcas}\line(2,0){\value{elzc@Arista}}}% \fi - \if@elzc@puntos\put(#1,#2){\circle*{\value{elzc@Punto}}}\fi + \if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi \if@elzc@lineas - \put(#1,#2){\line(-1,0){\value{elzc@TarjXdim}}}% - \put(#1,#2){\line(2,0){\value{elzc@TarjXdim}}}% + \put(#1,#2){\color{\elzc@ColorMarcas}\line(-1,0){\value{elzc@TarjXdim}}}% + \put(#1,#2){\color{\elzc@ColorMarcas}\line(2,0){\value{elzc@TarjXdim}}}% \fi \fi \fi \ifnum \value{elzc@ContY} = 0% - \if@elzc@guias\put(#1,#2){\line(0,-1){\value{elzc@Arista}}}\fi - \if@elzc@puntos\put(#1,#2){\circle*{\value{elzc@Punto}}}\fi + \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(0,-1){\value{elzc@Arista}}}\fi + \if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi \else \ifnum \value{elzc@ContY} = \value{elzc@NumY}% - \if@elzc@guias\put(#1,#2){\line(0,0){\value{elzc@Arista}}}\fi - \if@elzc@puntos\put(#1,#2){\circle*{\value{elzc@Punto}}}\fi + \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(0,0){\value{elzc@Arista}}}\fi + \if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi \else - \if@elzc@guias - \put(#1,#2){\line(0,0){\value{elzc@Arista}}}% - \put(#1,#2){\line(0,-1){\value{elzc@Arista}}}% + \if@elzc@cruces + \put(#1,#2){\color{\elzc@ColorMarcas}\line(0,0){\value{elzc@Arista}}}% + \put(#1,#2){\color{\elzc@ColorMarcas}\line(0,-1){\value{elzc@Arista}}}% \fi - \if@elzc@puntos\put(#1,#2){\circle*{\value{elzc@Punto}}}\fi + \if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi \if@elzc@lineas - \put(#1,#2){\line(0,0){\value{elzc@TarjYdim}}}% - \put(#1,#2){\line(0,-1){\value{elzc@TarjYdim}}}% + \put(#1,#2){\color{\elzc@ColorMarcas}\line(0,0){\value{elzc@TarjYdim}}}% + \put(#1,#2){\color{\elzc@ColorMarcas}\line(0,-1){\value{elzc@TarjYdim}}}% \fi \fi \fi} @@ -382,11 +396,16 @@ \message{ per page: \arabic{elzc@NumXY} (\arabic{elzc@NumX}x\arabic{elzc@NumY}),}% \message{ hsize=\the\elzc@TarjXdim, vsize=\the\elzc@TarjYdim, hgap=\the\elzc@SeparaX, vgap=\the\elzc@SeparaY,^^J}% - \if@elzc@guias + \if@elzc@cruces \message{ with crosses,}% \setlength{\elzc@TempLen}{\value{elzc@Arista}sp}% \message{segment length=\the\elzc@TempLen, line thickness=\the\@wholewidth.^^J}% \fi + \if@elzc@segmentos + \message{ with segments,}% + \setlength{\elzc@TempLen}{\value{elzc@Arista}sp}% + \message{segment length=\the\elzc@TempLen, line thickness=\the\@wholewidth.^^J}% + \fi \if@elzc@puntos \message{ with dots,}% \setlength{\elzc@TempLen}{\value{elzc@Punto}sp}% @@ -394,6 +413,9 @@ \fi \if@elzc@lineas \message{ with lines, line thickness=\the\@wholewidth.^^J}% + \fi + \if@elzc@sinmarcas + \message{ without cropping marks.^^J}% \fi} \setlength{\elzc@DefTPXdim}{3.5in} @@ -405,6 +427,7 @@ \setlength{\elzc@DefArista}{1mm} \setlength{\elzc@DefPunto}{1pt} \setlength{\elzc@DefLinea}{0.1mm} +\CropColor{Red!90!Black} \CropCrosses \InputIfFileExists{\jobname.aux}{}\relax -- cgit v1.2.3