removing duplicate graphicx package

wbh.tex

@@ -56,24 +56,24 @@ $endif$
 
 
 $if(tables)$
-	\usepackage{longtable,booktabs} % This two Packages are needet for Pandoc Table support. Issue is opened: https://github.com/jgm/pandoc/issues/1023
+\usepackage{longtable,booktabs} 			% This two Packages are needet for Pandoc Table support. Issue is opened: https://github.com/jgm/pandoc/issues/1023
 $endif$
+
 \usepackage{multirow}
 
 $if(graphics)$
- \usepackage{graphicx}
+\makeatletter
- \makeatletter
+\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
- \def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi}
+\def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
- \def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi}
+\makeatother
- \makeatother
+% Scale images if necessary, so that they will not overflow the page
- % Scale images if necessary, so that they will not overflow the page
+% margins by default, and it is still possible to overwrite the defaults
- % margins by default, and it is still possible to overwrite the defaults
+% using explicit options in \includegraphics[width, height, ...]{}
- % using explicit options in \includegraphics[width, height, ...]{}
+\setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
- \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio}
+% Set default figure placement to htbp
- % Set default figure placement to htbp
+\makeatletter
- \makeatletter
+\def\fps@figure{htbp}
- \def\fps@figure{htbp}
+\makeatother
- \makeatother
 $endif$
 
 % Support hyperref with colorisation