Skip to content

Commit

Permalink
Revert "fix #1691: use the grffile package only if it exists (it has …
Browse files Browse the repository at this point in the history
…become a legacy package, and won't be available in future versions of TeX Live)"

This reverts commit 1f63943.

The fix is no loner necessary since the grffile package is back: rstudio/tinytex#152 (comment)
  • Loading branch information
yihui committed Nov 25, 2019
1 parent 5bb98e1 commit 00a4a45
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 15 deletions.
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ rmarkdown 1.18

- `rmarkdown::run(file = NULL, dir = "foo/")` failed to run Rmd files under the `foo/` directory (thanks, @jenzopr, #1703).

- Reverted the fix for #1692 since it is no longer necessary (https://github.com/yihui/tinytex/issues/152#issuecomment-552796864).


rmarkdown 1.17
================================================================================
Expand Down
6 changes: 1 addition & 5 deletions inst/rmd/latex/default-1.14.tex
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,7 @@
\usepackage{longtable,booktabs}
$endif$
$if(graphics)$
\usepackage{graphicx}
% grffile has become a legacy package: https://ctan.org/pkg/grffile
\IfFileExists{grffile.sty}{%
\usepackage{grffile}
}{}
\usepackage{graphicx,grffile}
\makeatletter
\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}
Expand Down
6 changes: 1 addition & 5 deletions inst/rmd/latex/default-1.15.2.tex
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,7 @@
\usepackage{longtable,booktabs}
$endif$
$if(graphics)$
\usepackage{graphicx}
% grffile has become a legacy package: https://ctan.org/pkg/grffile
\IfFileExists{grffile.sty}{%
\usepackage{grffile}
}{}
\usepackage{graphicx,grffile}
\makeatletter
\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}
Expand Down
6 changes: 1 addition & 5 deletions inst/rmd/latex/default-1.17.0.2.tex
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,7 @@
\usepackage{longtable,booktabs}
$endif$
$if(graphics)$
\usepackage{graphicx}
% grffile has become a legacy package: https://ctan.org/pkg/grffile
\IfFileExists{grffile.sty}{%
\usepackage{grffile}
}{}
\usepackage{graphicx,grffile}
\makeatletter
\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}
Expand Down

0 comments on commit 00a4a45

Please sign in to comment.