summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/luaotfload.sty7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/luaotfload.sty b/src/luaotfload.sty
index 7bcde64..e89ce86 100644
--- a/src/luaotfload.sty
+++ b/src/luaotfload.sty
@@ -33,7 +33,7 @@
\csname ifluaotfloadloaded\endcsname
\let\ifluaotfloadloaded\endinput
\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
+\expandafter\ifx\csname selectfont\endcsname\relax
\input luatexbase.sty
\else
\NeedsTeXFormat{LaTeX2e}
@@ -46,10 +46,10 @@
\RequireLuaModule{luaotfload-main}
% for compatibility with beamer class, which loads pgf package.
-\ifcsname AtBeginDocument\endcsname
+\expandafter\newtoks\csname pgf@sys@pgf@resource@list@extgs@toks\endcsname
+\ifcsname selectfont\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}}
@@ -59,7 +59,6 @@
\ifcsname pgf@sys@pgf@resource@list@extgs\endcsname\else\endinput\fi
\count255=\the\catcode`@\relax
\catcode`@=11\relax
-\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}}