From a3476613318cc7c815bb889011dfa73eaee4eb2c Mon Sep 17 00:00:00 2001
From: Dohyun Kim <nomosnomos@gmail.com>
Date: Mon, 4 May 2015 22:01:59 +0900
Subject: fix prev commit

---
 src/luaotfload.sty | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/luaotfload.sty')

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}}
-- 
cgit v1.2.3

