From af97fd519b6d7cfd718d9bf9442f05e1095d2be7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 13 May 2011 22:29:11 +0000 Subject: eskdx 0.98 (13may11) git-svn-id: svn://tug.org/texlive/trunk@22465 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty | 42 ++++++++++++++++++------- 1 file changed, 30 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty') diff --git a/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty b/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty index fc59692a076..1f1958b776f 100644 --- a/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty +++ b/Master/texmf-dist/tex/latex/eskdx/eskdstamp.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eskdstamp}[2006/11/28 v0.97 Stamp GOST 2.104-68] +\ProvidesPackage{eskdstamp}[2011/05/06 v0.98 Stamp GOST 2.104-68] \RequirePackage{calc} @@ -616,14 +616,16 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry} \setlength{\unitlength}{1mm}% \begin{picture}(0,0)(0,0) \linethickness{\ESKDlineThick} -\put(0,7){\line(1,0){120}} -\put(0,0){\line(0,1){7}} -\put(14,0){\line(0,1){7}} -\put(67,0){\line(0,1){7}} -\put(0,0){\parbox[b][7mm][c]{14mm}{% +\put(0,14){\line(1,0){120}} +\put(0,0){\line(0,1){14}} +\put(14,0){\line(0,1){14}} +\put(67,0){\line(0,1){14}} +\put(0,0){\parbox[b][14mm][c]{14mm}{% \centering\ESKDfontIII\ESKDtheColumnXXVII}} -\put(14,2.3){\makebox[53mm][c]{\ESKDfontIII\ESKDtheColumnXXVIII}} -\put(67,2.3){\makebox[53mm][c]{\ESKDfontIII\ESKDtheColumnXXIX}} +\put(15,0){\parbox[b][14mm][c]{51mm}{% + \centering\ESKDfontIII\ESKDtheColumnXXVIII}} +\put(68,0){\parbox[b][14mm][c]{51mm}{% + \centering\ESKDfontIII\ESKDtheColumnXXIX}} \end{picture}}} \newsavebox{\ESKD@column@xxx@box} \AtBeginDocument{% @@ -887,7 +889,7 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry} \ESKDputOnStyle{formI}{zonelabels}{\ESKDdrawZoneLabelsI} \fi -\ESKDnewStyle{formII}{\ifESKD@enable@columns@xxvii 55mm\else 40mm\fi} +\ESKDnewStyle{formII}{\ifESKD@enable@columns@xxvii 62mm\else 40mm\fi} \ESKDputOnStyle{formII}{frame}{\ESKDdrawFrame} \ESKDputOnStyle{formII}{stamp}{\ESKDdrawStampII} \ifESKD@enable@columns@xix @@ -978,18 +980,34 @@ headheight=0mm,headsep=0mm,footskip=0mm]{geometry} \EveryShipout{\ESKD@ShipoutPicture} \RequirePackage{chngpage} +\RequirePackage{ifpdf} +% \ESKD@tmpdima --- width +% \ESKD@tmpdimb --- height \newcommand{\ESKDstyle}[1]{% \pagestyle{empty}% \def\ESKD@curstyle{#1}% -\changetext{\paperheight-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% - \expandafter-\@nameuse{ESKD@style@sh@\ifESKD@ignstamp empty\else #1\fi}-\textheight}{}{}{}{}% +\ifpdf% + \setlength{\ESKD@tmpdimb}{\pdfpageheight}% + \setlength{\ESKD@tmpdima}{\pdfpagewidth}% +\else% + \setlength{\ESKD@tmpdima}{\paperwidth}% + \setlength{\ESKD@tmpdimb}{\paperheight}% +\fi% +\changetext{\ESKD@tmpdimb-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% + \expandafter-\@nameuse{ESKD@style@sh@\ifESKD@ignstamp empty\else #1\fi}-\textheight}% + {\ESKD@tmpdima-\ESKD@margin@si-\ESKD@margin@so-2\ESKD@padding@h-\textwidth}{}{}{}% \let\ESKD@thisstyle\@empty} \newcommand{\ESKDthisStyle}[1]{% \thispagestyle{empty}% \def\ESKD@thisstyle{#1}% -\setlength{\vsize}{\paperheight-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% +\ifpdf% + \setlength{\ESKD@tmpdimb}{\pdfpageheight}% +\else% + \setlength{\ESKD@tmpdimb}{\paperheight}% +\fi% +\setlength{\vsize}{\ESKD@tmpdimb-\ESKD@margin@t-\ESKD@margin@b-2\ESKD@curpad@v% \expandafter-\@nameuse{ESKD@style@sh@\ifESKD@ignstamp empty\else #1\fi}}% \setlength{\@colht}{\vsize}\setlength{\@colroom}{\vsize}} -- cgit v1.2.3