summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-22 22:34:22 +0000
committerKarl Berry <karl@freefriends.org>2017-01-22 22:34:22 +0000
commit4f70a140932277cc2ef6292e47ebe25c5d8c3230 (patch)
tree09c23cbf4ffd71fde1b8049902f73511adef85d9 /Master/texmf-dist/tex/latex/fontspec/fontspec.lua
parent60a21cad39ca930406807ef85e67b5b3f8407b2a (diff)
fontspec (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec.lua')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.lua18
1 files changed, 12 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 0d3b3c170ce..9ab8febf070 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -7,7 +7,7 @@
-- fontspec-lua.dtx (with options: `lua')
-- ------------------------------------------------
-- The FONTSPEC package for XeLaTeX/LuaLaTeX
--- (C) 2004--2016 Will Robertson and Khaled Hosny
+-- (C) 2004--2017 Will Robertson and Khaled Hosny
-- License information appended.
-- ------------------------------------------------
fontspec = fontspec or {}
@@ -26,8 +26,14 @@ local err, warn, info, log = luatexbase.provides_module(fontspec.module)
fontspec.log = log or (function (s) luatexbase.module_info("fontspec", s) end)
fontspec.warning = warn or (function (s) luatexbase.module_warning("fontspec", s) end)
fontspec.error = err or (function (s) luatexbase.module_error("fontspec", s) end)
-local function tempswatrue() tex.sprint([[\FontspecSetCheckBoolTrue ]]) end
-local function tempswafalse() tex.sprint([[\FontspecSetCheckBoolFalse]]) end
+local latex
+if luatexbase.registernumber then
+ latex = luatexbase.registernumber("catcodetable@latex")
+else
+ latex = luatexbase.catcodetables.CatcodeTableLaTeX
+end
+local function tempswatrue() tex.sprint(latex,[[\FontspecSetCheckBoolTrue ]]) end
+local function tempswafalse() tex.sprint(latex,[[\FontspecSetCheckBoolFalse]]) end
function fontspec.check_ot_script(fnt, script)
if luaotfload.aux.provides_script(font.id(fnt), script) then
tempswatrue()
@@ -65,15 +71,15 @@ function fontspec.mathfontdimen(fnt, str)
end
end
-- ------------------------------------------------
--- Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
+-- Copyright 2004--2017 Will Robertson <wspr81@gmail.com>
-- Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
--
-- Distributable under the LaTeX Project Public License, version 1.3c or higher.
-- The latest version of this license is at: http://www.latex-project.org/lppl.txt
--
-- This work is "maintained" by Will Robertson.
--- It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex.
--- And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
+-- It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec*.tex.
+-- And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
-- ------------------------------------------------
--
-- End of file `fontspec.lua'.