Beamer template: Consistent styles for figure and table captions
Fix issue #52: set max width and height of images in default.beamer
Merge pull request #44 from aaronwolen/beamer-captions

Beamer template: Consistent styles for figure and table captions
LaTeX template:  Allow bibliography to be used in place of biblio-files.

Closes #43.  Thanks to nougad.
Revert "LaTeX template:  Allow bibliography to be used in place of biblio-files."

This reverts commit 5f8d7968fe7c3d8da3363b7e3ff1a11914c081ae.

I'll use a different approach, setting the biblio-files variable
in the LaTeX writer. This will also work for beamer.

See #42.
Use \setkeys{Gin}{} to set appropriate defaults for \includegraphics, instead of entirely redefining this command.

Note we also consider the height of images; if an image is too high, 0.8\textheight will be used for beamer slides, and \textheight is used for articles (see http://tex.stackexchange.com/q/11954/9128).

If the user has explicitly provided the width/height options in \includegraphics[], our defaults will be overwritten, and this approach is better than the check `\@ifnextchar[` after \includegraphics because the latter approach simply gives up everything once it sees [, whereas \setkeys{Gin} can keep the good defaults unless they are explicitly overwritten in [].

closes #30, closes #28, and closes #26
Merge pull request #58 from yihui/master

Use \setkeys{Gin}{} to set appropriate defaults for \includegraphics
upquote must be used after fontenc

otherwise single quotes in verbatim environments will be in trouble; see an example at http://stackoverflow.com/a/12852815/559676
Merge pull request #60 from yihui/patch-1

upquote must be used after fontenc
Load upquote after fontenc in latex template.
latex template:  conditionalize author and date.

Thanks to ivoanjo for the patch. Closes #61.
latex template:  Added fontfamily variable.

Thanks to tlvince for the patch.  Closes #50.
latex template: Added linestretch variable that loads setspace.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	default.latex