diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-06-13 00:40:45 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-06-13 00:40:45 +0200 |
| commit | 90f398e1c9d2896b2d30d0b66f9c8a88255511a8 (patch) | |
| tree | 88459ad0c6986a6648c969726081248cd5c8d74e /src/luaotfload.sty | |
| parent | c4c4901173b0f4284534db1b6a3cfe865b05e15c (diff) | |
| parent | b271e253b40cd0af97f6d50f0461f87ad1ed5314 (diff) | |
| download | luaotfload-90f398e1c9d2896b2d30d0b66f9c8a88255511a8.tar.gz | |
Merge pull request #274 from phi-gamma/master
pull in current state of affairs
Diffstat (limited to 'src/luaotfload.sty')
| -rw-r--r-- | src/luaotfload.sty | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/luaotfload.sty b/src/luaotfload.sty index 4ebe3cb..34f9a87 100644 --- a/src/luaotfload.sty +++ b/src/luaotfload.sty @@ -1,8 +1,9 @@ -%% Copyright (C) 2009-2014 +%% Copyright (C) 2009-2015 %% %% by Elie Roux <elie.roux@telecom-bretagne.eu> %% and Khaled Hosny <khaledhosny@eglug.org> %% and Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de> +%% and Dohyun Kim <nomosnomos@gmail.com> %% %% This file is part of Luaotfload. %% @@ -33,15 +34,35 @@ \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} \ProvidesPackage{luaotfload}% %% FIXME The date is meaningless, we need to find a way to %% use the git revision instead. - [2014/07/24 v2.5-2 OpenType layout system] + [2015/03/29 v2.6 OpenType layout system] \RequirePackage{luatexbase} \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 |