under latex, order of package loading is irrelevant

1 files changed, 10 insertions, 1 deletions

diff --git a/src/luaotfload.sty b/src/luaotfload.sty
index 63d98ca..7bcde64 100644
--- a/src/luaotfload.sty
+++ b/src/luaotfload.sty
@@ -46,7 +46,16 @@
 \RequireLuaModule{luaotfload-main}
 
 % for compatibility with beamer class, which loads pgf package.
-% under non-beamer class, tikz (pgf) should be loaded before luaotfload.
+\ifcsname AtBeginDocument\endcsname
+\AtBeginDocument{
+  \@ifpackageloaded{pgf}{
+    \newtoks\pgf@sys@pgf@resource@list@extgs@toks
+    \def\pgf@sys@pgf@resource@list@extgs{\the\pgf@sys@pgf@resource@list@extgs@toks}
+    \def\pgf@sys@addpdfresource@extgs@plain#1{\global\pgf@sys@pgf@resource@list@extgs@toks
+      \expandafter{\the\pgf@sys@pgf@resource@list@extgs@toks #1}}
+  }{}}
+\endinput\fi
+% under plain tex, tikz (pgf) should be loaded before luaotfload.
 \ifcsname pgf@sys@pgf@resource@list@extgs\endcsname\else\endinput\fi
 \count255=\the\catcode`@\relax
 \catcode`@=11\relax