@@ -65,24 +65,14 @@ $if(tables)$
6565$endif$
6666$if(graphics)$
6767\usepackage{graphicx}
68−% Redefine \includegraphics so that, unless explicit options are
69−% given, the image width will not exceed the width of the page.
70−% Images get their normal width if they fit onto the page, but
71−% are scaled down if they would overflow the margins.
7268\makeatletter
73−\def\ScaleIfNeeded{%
74− \ifdim\Gin@nat@width>\linewidth
75− \linewidth
76− \else
77− \Gin@nat@width
78− \fi
79−}
69+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
70+\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
8071\makeatother
81−\let\Oldincludegraphics\includegraphics
82−{%
83− \catcode`\@=11\relax%
84− \gdef\includegraphics{\@ifnextchar[{\Oldincludegraphics}{\Oldincludegraphics[width=\ScaleIfNeeded]}}%
85−}%
72+% Scale images if necessary, so that they will not overflow the page
73+% margins by default, and it is still possible to overwrite the defaults
74+% using explicit options in \includegraphics[width, height, ...]{}
75+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
8676$endif$
8777\ifxetex
8878 \usepackage[setpagesize=false, % page size defined by xetex