summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-07-30 07:46:13 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2015-07-30 07:46:13 +0200
commit15d337dc09e24d2d12418a00be11adaeac1200e9 (patch)
tree8c17f3391358897a5b73ce44b792504de13481cf /src
parent11cab572fa7addf670c958e680aaf81299f201ac (diff)
parentbc277dc065a8ca8bae05b9a5224ef377c5d88964 (diff)
downloadluaotfload-15d337dc09e24d2d12418a00be11adaeac1200e9.tar.gz
Merge pull request #283 from phi-gamma/master
Revert package-specific code
Diffstat (limited to 'src')
-rw-r--r--src/luaotfload-colors.lua2
-rw-r--r--src/luaotfload.sty20
2 files changed, 1 insertions, 21 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.sty b/src/luaotfload.sty
index 34f9a87..c9c9864 100644
--- a/src/luaotfload.sty
+++ b/src/luaotfload.sty
@@ -46,23 +46,3 @@
\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
- \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