diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/geometry/README | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/geometry/changes.txt | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/geometry/geometry.pdf | bin | 232572 -> 233784 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/geometry/geometry.dtx | 116 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/geometry/geometry.ins | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/geometry/geometry.sty | 15 |
6 files changed, 93 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/latex/geometry/README b/Master/texmf-dist/doc/latex/geometry/README index 45aa6eb8407..426e5ce24c6 100644 --- a/Master/texmf-dist/doc/latex/geometry/README +++ b/Master/texmf-dist/doc/latex/geometry/README @@ -1,6 +1,6 @@ -LaTeX Package: Geometry 2010/07/08 v5.4 +LaTeX Package: Geometry 2010/07/13 v5.5 ---------------------------------------- -Flexible and easy interface to page dimensions +Flexible and complete interface to document dimensions. Copyright (C) 1996-2010 by Hideo Umeki <latexgeometry@gmail.com> @@ -15,19 +15,21 @@ Abstract: CTAN: macros/latex/contrib/geometry Recent changes: -[Release 5.0-5.4] +[Release 5.0-5.5] * Changing page layout mid-document. - * A new set of options to specify the layout area. + * A new set of options to specify layout area. * A new driver option 'xetex'. * New paper size presets for JIS B-series and ISO C-series. * Changing default for underspecified margin. * The option 'showframe' works on every page. - * The option 'showcrop' prints cross-shape cropmarks at each corner. - * Package 'atbegshi' is required when using 'showframe' or 'showcrop'. + * The option 'showcrop' prints elbow-shaped crop marks at each corner + of the layout area, which is equal to paper size. + * Package 'atbegshi' is required when 'showframe' or 'showcrop' is specified. * Loading geometry.cfg precedes processing class options. * Deleted options: 'compat2' and 'twosideshift'. * Added 'onecolumn' option as a shorthand for 'twocolumn=false'. * Changed the format of the verbose mode. + * Fixed typos and wrong figures, and revised expressions in the document. (changes.txt for more history) diff --git a/Master/texmf-dist/doc/latex/geometry/changes.txt b/Master/texmf-dist/doc/latex/geometry/changes.txt index 3d946793be0..ec19d341705 100644 --- a/Master/texmf-dist/doc/latex/geometry/changes.txt +++ b/Master/texmf-dist/doc/latex/geometry/changes.txt @@ -1,3 +1,11 @@ +2010-07-13 Release 5.5 + * Fixed a bug where paper width and height were swapped unnecessarily + inside \newgeometry{} if 'landscape' is given as a class option. + * Changed crop marks with elbow-shaped lines 17mm long and offset by 3mm. + * Added 'showframe' and 'showcrop' as options shown in verbose mode. + * Fixed typos and wrong figures, and revised expressions in the document. + * Added missed things that had been fixed for v5.4 into changes.txt. + 2010-07-08 Release 5.4 * New paper size presets for ISO C-series: 'c0paper' to 'c6paper'. * Fixed a bug where overloading shipout in 'showframe' and/or 'showcrop' @@ -6,8 +14,12 @@ Options 'showframe' and 'showcrop' require the package. * Fixed a bug where restoring layoutwidth and layoutheight failed when \restoregeometry is called. + * Fixed a bug that forced papersize to set the same length + as the specified layoutsize. * Fixed a bug where page frame shown in 'showframe' mode was placed slightly wrong. + * Fixed wrong 'h-part' calculation in verbose when bindingoffset + or mag is specified. * Changed format and fixed values shown in verbose mode. 2010-03-13 Release 5.3 diff --git a/Master/texmf-dist/doc/latex/geometry/geometry.pdf b/Master/texmf-dist/doc/latex/geometry/geometry.pdf Binary files differindex e8beba468ab..3b4f7ca9955 100644 --- a/Master/texmf-dist/doc/latex/geometry/geometry.pdf +++ b/Master/texmf-dist/doc/latex/geometry/geometry.pdf diff --git a/Master/texmf-dist/source/latex/geometry/geometry.dtx b/Master/texmf-dist/source/latex/geometry/geometry.dtx index 4e6a64d801c..67c5479b531 100644 --- a/Master/texmf-dist/source/latex/geometry/geometry.dtx +++ b/Master/texmf-dist/source/latex/geometry/geometry.dtx @@ -39,12 +39,12 @@ %</ignore> %<package|driver>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{geometry} -%<package> [2010/07/08 v5.4 Page Geometry] +%<package> [2010/07/13 v5.5 Page Geometry] %<*install> \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: geometry 2010/07/08 v5.4 Page Geometry} +\Msg{* Package: geometry 2010/07/13 v5.5 Page Geometry} \Msg{************************************************************************} \keepsilent @@ -117,7 +117,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. %</driver> % \fi % -% \CheckSum{2674} +% \CheckSum{2677} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -185,7 +185,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % This package provides a flexible and easy interface to page dimensions. % You can change the page layout with intuitive parameters. For instance, % if you want to set a margin to 2cm from each edge of the paper, -% you can go just |\usepackage[margin=2cm]{geometry}|. +% you can type just |\usepackage[margin=2cm]{geometry}|. % The page layout can be changed in the middle of the document % with |\newgeometry| command. % \end{abstract} @@ -227,13 +227,14 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % and got |top=1cm| in this case. % The version 5 sets the text-body size with the default |scale| % ($=0.7$) and determine the unspecified margin. (See Section~\ref{sec:rules}) -% \item \textbf{The option |showframe| works on every page.}\par +% \item \textbf{The option |showframe| and |showcrop| works on every page.}\par % With |showframe| option, the page frames are shown on every page. -% In addition, the new option |showcrop| would print cropmarks showing -% the corners of the layout (the same as paper by default) on every -% page. Version 5.4 introduced a new |\shipout| overloading process -% using \textsf{atbegshi} package, so the \textsf{atbegshi} package -% is required when using showframe or showcrop option. +% In addition, a new option |showcrop| prints crop marks at each +% corner of layout area on every page. Note that the marks would be +% invisible without specifying the layout size smaller than paper size. +% Version 5.4 introduced a new |\shipout| overloading process using +% \textsf{atbegshi} package, so the \textsf{atbegshi} package +% is required when showframe or showcrop option is specified. % \item \textbf{Loading geometry.cfg precedes processing class options.}\par % The previous version loaded \textsf{geometry.cfg} after % processing the document class options. Now that the config file is @@ -269,11 +270,11 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \end{quote} % Besides centering problem, setting margins from each edge of the paper is % also troublesome. But \Gm\ also make it easy. -% If you want to set each margin 1.5in, you can go +% If you want to set each margin to 1.5in, you can type % \begin{quote} % |\usepackage[margin=1.5in]{geometry}| % \end{quote} -% Thus, the geometry package has an auto-completion mechanisim, in which +% Thus, the geometry package has an auto-completion mechanism, in which % unspecified dimensions are automatically determined. % The \Gm\ package will be also useful when you have to set page layout % obeying the following strict instructions: for example, @@ -284,7 +285,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % the left edge. The footer with page number should be at the bottom % of the text area. % \end{quote} -% In this case, using \Gm\ you can go +% In this case, using \Gm\ you can type % \begin{quote} % |\usepackage[total={6.5in,8.75in},|\\ % | top=1.2in, left=0.9in, includefoot]{geometry}|. @@ -756,7 +757,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \put(40,240){\vector(-1,0){20}} % \put(140,240){\vector(1,0){20}} % \put(10,145){\vector(0,1){85}} -% \put(15,125){\makebox(0,20)[r]{|layoutwidth|}} +% \put(15,125){\makebox(0,20)[r]{|layoutheight|}} % \put(10,125){\vector(0,-1){85}} % \put(280,0){\makebox(168,12)[r]{\gpart{paper}}} % \put(280,0){\framebox(170,230){}} @@ -1218,7 +1219,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % packages and manual settings without \Gm. % \item[\onlypre showframe] shows visible frames for the text area and page, % and the lines for the head and foot on the first page. -% \item[\onlypre showcrop] prints cross-shape cropmarks at each corner. +% \item[\onlypre showcrop] prints crop marks at each corner of user-specified +% layout area. % \end{Options} % % \section{Processing options}\label{sec:process} @@ -1281,8 +1283,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \subsection{Priority}\label{sec:priority} % % There are several ways to set dimensions of the \gpart{body}: -% |scale|, |total|, |text| and |lines|. The \Gm\ package gives higer -% priority to the more concrete specificaion. Here is the priority +% |scale|, |total|, |text| and |lines|. The \Gm\ package gives higher +% priority to the more concrete specification. Here is the priority % rule for \gpart{body}. % \[\begin{array}{c} % \textrm{priority:}\qquad\textrm{low}\quad @@ -1334,7 +1336,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \end{itemize} % For \textit{twosided} document with |twoside| option, the default % setting is the same as \textit{onesided} except that the horizontal -% margin ratio is set |2:3| as well. +% margin ratio is set to |2:3| as well. % % Additional options overwrite the previous specified dimensions. % @@ -1349,7 +1351,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % For example, the specification |width=14cm, left=3cm| is categorized % into \Ss(1,1), which is an adequate specification. If you add % |right=4cm|, it would be in \Ss(2,1) and overspecified. -% if only |width=14cm|, it's in \Ss(0,1), underspecified. +% If only |width=14cm| is given, it's in \Ss(0,1), underspecified. % % The \Gm\ package has the auto-completion mechanism, in which % if the layout parameters are underspecified or overspecified, @@ -1406,7 +1408,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \caption[Specifications and completion rules]{% % \begin{minipage}[t]{.7\textwidth}\raggedright\small % Specifications \Ss(0,0) to \Ss(2,1) and the completion rules -% (arrows). The horizonal and vertical denote the number of explicitly +% (arrows). Column and row numbers denote the number of explicitly % specified lengths for margin and body respectively. \Ss($m$,$b$) denote a % specification with a set of the numbers $(\gpart{margin},\gpart{body})=(m,b)$. % \end{minipage}} @@ -1417,7 +1419,10 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \item[\Ss(0,0)] % Nothing is specified. The \Gm\ package sets \gpart{body} with the % default |scale| ($=0.7$). \\ For example, |width| is set to be -% |0.7\paperwidth|. Thus \Ss(0,0) goes to \Ss(0,1). See \Ss(0,1). +% $|0.7|\times|layoutwidth|$. Note that by default |layoutwidth| +% and |layoutheight| will be equal to |\paperwidth| and |\paperheight| +% respectively. +% Thus \Ss(0,0) goes to \Ss(0,1). See \Ss(0,1). % \bigskip % % \item[\Ss(0,1)] @@ -1442,7 +1447,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \Gm\ calculates |top| margin as follows: % \begin{equation} % \begin{array}{ll} -% |top| &= ( |paperheight| - |height| ) \times 2/5 \\ +% |top| &= ( |layoutheight| - |height| ) \times 2/5 \\ % &= (29.7-22)\times2/5 = 3.08\textrm{(cm)} % \end{array} % \end{equation} @@ -1460,11 +1465,12 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \gpart{body} with the default |scale| ($=0.7$). % For example, if |top=2.4cm| is specified, \Gm\ sets % \begin{center} -% $|height|= |0.7\paperheight|$, +% $|height|= |0.7|\times|layoutheight|$ +% ~~($=|0.7\paperheight|$ by default), % \end{center} % then \Ss(1,0) goes to \Ss(1,1), in which |bottom| is calculated -% with $|paperheight|-(|height|+|top|)$ and results in 6.51cm on A4 -% paper. +% with $|layoutheight|-(|height|+|top|)$ and results in 6.51cm on A4 +% paper if the layout size is equal to the paper size. % \medskip % \item \textbf{If the margin ratio is specified}, such as % |hmarginratio={1:2}|, |vratio={3:4}| and so forth, @@ -1477,7 +1483,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % Thus \Ss(1,0) goes to \Ss(2,0). % \end{itemize} % -% Notes that the version 4 or earlier used to set the other margin +% Note that the version 4 or earlier used to set the other margin % with the margin ratio. In the version 5, therefore, with the % same specification, the result will be different from the one in the % version 4. For example, if only |top=2.4cm| is specified, @@ -1577,8 +1583,9 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \put(360,90){\circle*{4}} % \put(366,90){\circle*{4}} % \put(375,165){\makebox(95,12){\cs{newgeometry}}} -% \put(383,33){\framebox(80,120){\gpart{body}}} -% \put(383,21){\makebox(80,12){\gpart{foot}}} +% \put(383,41){\framebox(80,111){\gpart{body}}} +% \put(383,29){\makebox(80,12){\gpart{foot}}} +% \put(383,29){\line(1,0){80}} % \put(375,20){\framebox(95,140){}} % \put(375,0){\makebox(95,20){L3 (new)}} % \end{picture}} @@ -1618,14 +1625,14 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \item |vcentering| % \end{itemize} % -% \item A twosided page layout with the inside offset for binding |1cm|. +% \item A twosided page layout with the inside offset for binding set to |1cm|. % \begin{itemize} % \item |twoside, bindingoffset=1cm| % \end{itemize} % In this case, |textwidth| is shorter than that of the default twosided % document by $0.7\times|1cm|$ ($=|0.7cm|$) because the default width of -% \gpart{body} is set with |scale=0.7| (which means -% $|width|=0.7|\paperwidth|$). +% \gpart{body} is set with |scale=0.7|, which means +% $|width|=|0.7|\times|layoutwidth|$ ($=|0.7\paperwidth|$ by default). % % \item A layout with the left, right, and top margin |3cm|, |2cm| and % |2.5in| respectively, with textheight of 40 lines, and with the head and @@ -1657,7 +1664,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % % \item A layout with \glen{textwidth} and \glen{textheight} 90\% of the % paper and with \gpart{body} centered. -% Each solution below results in the same page layout. +% Each solution below results in the same page layout as long as +% |layoutwidth| and |layoutheight| are not modified from the default. % \begin{itemize} % \item |scale=0.9, centering| % \item |text={.9\paperwidth,.9\paperheight}, ratio=1:1| @@ -1670,23 +1678,23 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \begin{quote}\small % |Underfull \vbox (badness 10000) has occurred while \output is active|. % \end{quote} -% See Section~\ref{sec:body} for the detail description about |heightrounded|. +% See Section~\ref{sec:body} for the detailed description about |heightrounded|. % -% \item A layout with the width of marginal notes |3cm| and included in the -% width of \gpart{total body}. The following examples are the same. +% \item A layout with the width of marginal notes set to |3cm| and included +% in the width of \gpart{total body}. The following examples are the same. % \begin{itemize} % \item |marginparwidth=3cm, includemp| % \item |marginpar=3cm, ignoremp=false| % \end{itemize} % -% \item A layout the full scale \gpart{body} of the paper with A5 paper in +% \item A layout where \gpart{body} occupies the whole paper with A5 paper in % landscape. The following examples are the same. % \begin{itemize} % \item |a5paper, landscape, scale=1.0| % \item |landscape=TRUE, paper=a5paper, margin=0pt| % \end{itemize} % -% \item A screen size layout appropriate to presentation with PC and video +% \item A screen size layout appropriate for presentation with PC and video % projector. % \begin{verbatim} % \documentclass{slide} @@ -1696,12 +1704,12 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % ... % \end{slide}\end{verbatim} % \item A layout with fonts and spaces both enlarged from A4 to A3. -% In the case below, the resulted paper size is A3. +% In the case below, the resulting paper size is A3. % \begin{itemize} % \item |a4paper, mag=1414|. % \end{itemize} % If you want to have a layout with two times bigger fonts, but without -% changing paper size, you can go +% changing paper size, you can type % \begin{itemize} % \item |letterpaper, mag=2000, truedimen|. % \end{itemize} @@ -1719,13 +1727,12 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % % \section{Known problems} % \begin{itemize} -% \item With |pdftex=true|, |mag| $\neq 1000$ and |truedimen|, +% \item With |mag| $\neq 1000$ and |truedimen|, % |paperwidth| and |paperheight| shown in verbose mode are different % from the real size of the resulted PDF. The PDF itself is correct anyway. % -% \item With |pdftex=true|, |mag| $\neq 1000$, \textit{no} |truedimen|, -% and \textsf{hyperref}, \textsf{hyperref} should be loaded -% by \cs{usepackage} before \Gm. +% \item With |mag| $\neq 1000$, \textit{no} |truedimen| +% and \textsf{hyperref}, \textsf{hyperref} should be loaded before \Gm. % Otherwise the resulted PDF size will become wrong. % % \item With \textsf{crop} package and |mag| $\neq 1000$, @@ -1876,7 +1883,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \begin{macro}{\Gm@Dvratio} % The default values for the horizontal and vertical % \textsl{marginalratio} are defined. \cs{Gm@Dhratiotwo} denotes the -% default value of horizonal \textsl{marginratio} for twoside +% default value of horizontal \textsl{marginratio} for twoside % page layout with left and right margins swapped on verso pages, % which is set by |twoside|. % \begin{macrocode} @@ -2918,9 +2925,9 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \end{macrocode} % \end{key} % \begin{key}{Gm}{truedimen} -% If |truedimen| is set to |true|, all of the internal explicit dimensions -% is changed to \textit{true} dimensions, e.g., |1in| is changed to -% |1truein|. +% If |truedimen| is set to |true|, all of the internal +% explicit dimensions is changed to \textit{true} dimensions, +% e.g., |1in| is changed to |1truein|. % \begin{macrocode} \define@key{Gm}{truedimen}[true]{\ifGm@preamble{truedimen}{% \Gm@doifelse{truedimen}{#1}{\let\Gm@truedimen\Gm@true}% @@ -2942,7 +2949,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. % \end{macrocode} % \end{key} % \begin{key}{Gm}{showcrop} -% The showcrop option prints cropmarks at the corners. +% The showcrop option prints crop marks at each corner of the layout area. % \begin{macrocode} \define@key{Gm}{showcrop}[true]{\Gm@setbool{showcrop}{#1}}% % \end{macrocode} @@ -3329,6 +3336,8 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \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% @@ -3364,9 +3373,9 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \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@}% @@ -3388,9 +3397,9 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \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% @@ -3688,6 +3697,7 @@ the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. \newcommand{\newgeometry}[1]{% \clearpage \Gm@restore@org + \Gm@swap@papersizefalse \Gm@initnewgm \Gm@newgmtrue \setkeys{Gm}{#1}% diff --git a/Master/texmf-dist/source/latex/geometry/geometry.ins b/Master/texmf-dist/source/latex/geometry/geometry.ins index ec50cc41ccb..655e0e56459 100644 --- a/Master/texmf-dist/source/latex/geometry/geometry.ins +++ b/Master/texmf-dist/source/latex/geometry/geometry.ins @@ -26,7 +26,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: geometry 2010/07/08 v5.4 Page Geometry} +\Msg{* Package: geometry 2010/07/13 v5.5 Page Geometry} \Msg{************************************************************************} \keepsilent 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}% |