diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-15 23:15:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-15 23:15:50 +0000 |
commit | b755e65140bb4bc3a407bf1b0aea9dd78d846c8e (patch) | |
tree | da0e2d47400f23d2ec245ee003762c06af0f66ad /Master/texmf-dist/tex/latex/scanpages | |
parent | 025f7801135338482cf4d49f0a0b5b4e21a6807c (diff) |
scanpages (15may14)
git-svn-id: svn://tug.org/texlive/trunk@34050 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/scanpages')
-rw-r--r-- | Master/texmf-dist/tex/latex/scanpages/scanpages.sty | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/scanpages/scanpages.sty b/Master/texmf-dist/tex/latex/scanpages/scanpages.sty index edda1901709..5d24e8625e0 100644 --- a/Master/texmf-dist/tex/latex/scanpages/scanpages.sty +++ b/Master/texmf-dist/tex/latex/scanpages/scanpages.sty @@ -5,16 +5,16 @@ % Copyright (c) 2014 by Michael Sharpe, msharpe at ucsd dot edu; % This is free software, subject to the LATEX Project Public License. -\def\fileversion{1.02} -\def\filedate{2014/04/24} +\def\fileversion{1.03} +\def\filedate{2014/05/01} \ProvidesPackage{scanpages.sty}[\filedate\space v\fileversion] -\message{`scanpages' v\fileversion, \filedate\space Macros to help create documents from scanned pages(msharpe)} +\message{`scanpages' v\fileversion, \filedate\space Macros to help create documents from scanned pages (msharpe)} % \RequirePackage{ifpdf} \RequirePackage{pgffor} \RequirePackage{xcolor} -\RequirePackage{keyval} +\RequirePackage{xkeyval} \RequirePackage{fp-basic} \RequirePackage{graphicx} \RequirePackage{etoolbox} @@ -43,6 +43,7 @@ \x} \ProcessOptions* +\newcount\scanp@pgcnt \setlength\unitlength{1bp} \long\def\putn(#1,#2)#3{% \@killglue% @@ -69,6 +70,7 @@ \newdimen\scanp@xlbp\newdimen\scanp@ylbp\newdimen\scanp@xrbp\newdimen\scanp@yrbp\newdimen\@dima % \def\initviewport#1#2#3#4#5{% srcscale,llx,lly,srcw,srch +\scanp@pgcnt=\z@ \FPdiv\scanp@invscale{1.0}{\scanp@srcscale} \scanp@setlength{\scanp@swdim}{\scanp@srcw} \scanp@setlength{\scanp@shdim}{\scanp@srch} @@ -95,7 +97,7 @@ \newdimen\scanp@dxdim\newdimen\scanp@dydim \def\scanpage{\@ifnextchar[\scanpage@i{\scanpage@i[]}} -\def\scanpage@i[#1]#2{{\setkeys{scanpi}{#1}% +\def\scanpage@i[#1]#2{\advance\scanp@pgcnt\@ne\begingroup\setkeys{scanpi}{#1}% \edef\scanp@head{\noexpand\vspace*{\scanp@yindent}\noexpand\noindent\noexpand\hspace*{\scanp@xindent}\noexpand\picture(\strip@pt\scanp@dwdimbp,\strip@pt\scanp@dhdimbp)} %\edef\@x{\strip@pt\scanp@dwdimbp}\edef\@y{\strip@pt\scanp@dhdimbp} %\vspace*{\the\scanp@yindent}\noindent\hspace*{\scanp@xindent}\picture(\@x,\@y) @@ -112,11 +114,9 @@ \if\scanp@srcscale\scanp@origscale\else\edef\scanp@cmd{scale=\scanp@srcscale,\scanp@cmd}\fi \ifdefvoid{\scanp@page}{}{\edef\scanp@cmd{page=\scanp@page,\scanp@cmd}} \edef\scanp@cmd{\noexpand\scanp@head\noexpand\put(0,0){\noexpand\includegraphics[\scanp@cmd}} -%\show\scanp@cmd% -\scanp@cmd -\thegrid{\strip@pt\scanp@dwdimbp}{\strip@pt\scanp@dwdimbp} -\endpicture -\newpage}} +\scanp@cmd % \begingroup, start \picture, \put pdf at (0,0) +\thegrid{\strip@pt\scanp@dwdimbp}{\strip@pt\scanp@dhdimbp} +} \ifscanp@nogrid\def\thegrid#1#2{}\else% \long\def\thegrid#1#2{\edef\scanp@gcmd{\noexpand\put(0,0){\noexpand\line(1,0){#1}} @@ -135,9 +135,10 @@ } \foreach\x in {-300,-250,...,550}{% \put(\x,-500){\color{red!50}\line(0,1){1500}}% - \put(\x,-15){\x}% + \put(\x,-15){\x}} +\put(0,-30){\color{blue}Page \the\scanp@pgcnt}% \scanp@gcmd% -}} +} \fi % end \ifscanp@nogrid \endinput
\ No newline at end of file |