summaryrefslogtreecommitdiff
path: root/src/luaotfload.sty
diff options
context:
space:
mode:
Diffstat (limited to 'src/luaotfload.sty')
-rw-r--r--src/luaotfload.sty20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/luaotfload.sty b/src/luaotfload.sty
index 100fb72..6ea4c0a 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 ProvidesPackage\endcsname\relax
+\expandafter\ifx\csname selectfont\endcsname\relax
\input luatexbase.sty
\else
\NeedsTeXFormat{LaTeX2e}
@@ -45,3 +45,21 @@
\fi
\RequireLuaModule{luaotfload-main}
+% 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
+ \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
+\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