3 files changed, 1 insertions, 28 deletions
diff --git a/src/luaotfload-colors.lua b/src/luaotfload-colors.lua
index ff4dc13..89884b6 100644
--- a/src/luaotfload-colors.lua
+++ b/src/luaotfload-colors.lua
@@ -324,7 +324,7 @@ local color_handler = function (head)
         local no_extgs = not tpr:find("/ExtGState<<.*>>")
         local pgf_loaded = no_extgs and luaotfload.pgf_loaded
         if pgf_loaded then
-            tpr = texgettoks(pgf_loaded) -- see luaotfload.sty
+            tpr = texgettoks(pgf_loaded)
         end
 
         local t   = ""
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index e240e4c..4376e90 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -80,17 +80,10 @@ end
 local C, Ct, P, S  = lpeg.C, lpeg.Ct, lpeg.P, lpeg.S
 local lpegmatch    = lpeg.match
 
-local loader_file = "luatexbase.loader.lua"
-local loader_path = assert(kpsefind_file(loader_file, "lua"),
-                           "File '"..loader_file.."' not found")
-
-
 string.quoted = string.quoted or function (str)
   return string.format("%q",str) 
 end
 
-require (loader_path)
-
 --[[doc--
 
     XXX:
diff --git a/src/luaotfload.sty b/src/luaotfload.sty
index bff949b..825a3a5 100644
--- a/src/luaotfload.sty
+++ b/src/luaotfload.sty
@@ -54,23 +54,3 @@
   \directlua{require("luaotfload-main")}
 \fi
 
-% for compatibility with beamer class, which loads pgf package.
-\ifcsname selectfont\endcsname
-  \AtBeginDocument{\@ifpackageloaded{pgfsys}{
-    \csname newtoks\endcsname\pgf@sys@pgf@resource@list@extgs@toks
-    \directlua{luaotfload.pgf_loaded=\the\allocationnumber}
-    \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
-\newtoks\pgf@sys@pgf@resource@list@extgs@toks
-\directlua{luaotfload.pgf_loaded=\the\allocationnumber}
-\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}}
-\catcode`@=\the\count255\relax