1 files changed, 4 insertions, 8 deletions
diff --git a/Master/texmf-dist/asymptote/plain.asy b/Master/texmf-dist/asymptote/plain.asy
index 2d4c419ae00..ac7106e6668 100644
--- a/Master/texmf-dist/asymptote/plain.asy
+++ b/Master/texmf-dist/asymptote/plain.asy
@@ -282,17 +282,13 @@ if(settings.autoimport != "") {
 cputime();
 
 void nosetpagesize() {
-  if(latex() && pdf()) {
+  if(latex()) {
     // Portably pass nosetpagesize option to graphicx package.
-    texpreamble("\makeatletter\newif\ifGin@setpagesize");
-    if(settings.tex == "pdflatex")
-      texpreamble("\input pdftex.def");
-    else if(settings.tex == "xelatex")
-      texpreamble("\input xetex.def");
-    else if(settings.tex == "lualatex") {
+    if(settings.tex == "lualatex") {
       texpreamble("\ifx\pdfpagewidth\undefined\let\pdfpagewidth\paperwidth\fi");
       texpreamble("\ifx\pdfpageheight\undefined\let\pdfpageheight\paperheight\fi");
-    }
+    } else
+      texpreamble("\let\paperwidthsave\paperwidth\let\paperwidth\undefined\usepackage{graphicx}\let\paperwidth\paperwidthsave");
   }
 }