summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/geometry
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-14 16:40:53 +0000
committerKarl Berry <karl@freefriends.org>2010-07-14 16:40:53 +0000
commit6cc8017ab09cc54a9f88bcca6d4b9f09cef82185 (patch)
treeb056f06ccd9582c8a1d09c97469634b54892d19f /Master/texmf-dist/tex/latex/geometry
parent57e485197587d08aa2ca05ce2cc95e8063edd4cc (diff)
geometry 5.5 (13jul10)
git-svn-id: svn://tug.org/texlive/trunk@19448 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/geometry')
-rw-r--r--Master/texmf-dist/tex/latex/geometry/geometry.sty15
1 files changed, 9 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/geometry/geometry.sty b/Master/texmf-dist/tex/latex/geometry/geometry.sty
index c2f3961f570..b87bea8d016 100644
--- a/Master/texmf-dist/tex/latex/geometry/geometry.sty
+++ b/Master/texmf-dist/tex/latex/geometry/geometry.sty
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{geometry}
- [2010/07/08 v5.4 Page Geometry]
+ [2010/07/13 v5.5 Page Geometry]
\RequirePackage{keyval}%
\RequirePackage{ifpdf}%
\RequirePackage{ifvtex}%
@@ -862,6 +862,8 @@
\if@mparswitch\else\if@twoside asymmetric\space\fi\fi%
\Gm@showbool{heightrounded}%
\ifx\Gm@truedimen\@empty\else truedimen\space\fi%
+ \Gm@showbool{showframe}%
+ \Gm@showbool{showcrop}%
^^J%
* h-part:(L,W,R)=(\Gm@lmargin, \Gm@width, \Gm@rmargin)^^J%
* v-part:(T,H,B)=(\Gm@tmargin, \Gm@height, \Gm@bmargin)^^J%
@@ -892,9 +894,9 @@
\def\Gm@cropmark(#1,#2,#3,#4){%
\begin{picture}(0,0)
\setlength\unitlength{1truemm}%
- \linethickness{0.2pt}%
- \put(0,0){\line(#1,#2){5}}%
- \put(0,0){\line(#3,#4){5}}%
+ \linethickness{0.25pt}%
+ \put(#3,0){\line(#1,0){17}}%
+ \put(0,#4){\line(0,#2){17}}%
\end{picture}}%
\providecommand*\vb@xt@{\vbox to}%
\def\Gm@vrule{\vrule width 0.2pt height\textheight depth\z@}%
@@ -916,9 +918,9 @@
\hb@xt@\z@{\hskip-1\Gm@truedimen in\hskip\Gm@layouthoffset%
\vb@xt@\Gm@layoutheight{%
\let\protect\relax
- \hb@xt@\Gm@layoutwidth{\Gm@cropmark(1,0,0,-1)\hfil\Gm@cropmark(-1,0,0,-1)}%
+ \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}%
\vfil
- \hb@xt@\Gm@layoutwidth{\Gm@cropmark(1,0,0,1)\hfil\Gm@cropmark(-1,0,0,1)}}%
+ \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}%
\hss}%
\vss}%
\fi%
@@ -1094,6 +1096,7 @@
\newcommand{\newgeometry}[1]{%
\clearpage
\Gm@restore@org
+ \Gm@swap@papersizefalse
\Gm@initnewgm
\Gm@newgmtrue
\setkeys{Gm}{#1}%