diff options
author | Karl Berry <karl@freefriends.org> | 2016-01-30 23:00:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-01-30 23:00:25 +0000 |
commit | 0911ade404142a305ac949e3c53934a536168c3b (patch) | |
tree | a701776f43e3bddd09795208a8c3ed63ab5041cc /Master/texmf-dist/tex/latex/fontspec/fontspec.lua | |
parent | b9447fda2f7279a83d10a110619ece7d753633b0 (diff) |
fontspec (30jan16)
git-svn-id: svn://tug.org/texlive/trunk@39512 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.lua | 66 |
1 files changed, 21 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index f5c17fd02b5..ec0b8a171e2 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua @@ -4,48 +4,33 @@ -- -- The original source files were: -- --- fontspec.dtx (with options: `lua') --- --- _________________________________________ --- The fontspec package for XeLaTeX/LuaLaTeX --- (C) 2004--2015 Will Robertson and Khaled Hosny --- --- License information appended. --- --- - - +-- fontspec-lua.dtx (with options: `lua') +-- ------------------------------------------------ +-- The FONTSPEC package for XeLaTeX/LuaLaTeX +-- (C) 2004--2016 Will Robertson and Khaled Hosny +-- License information appended. +-- ------------------------------------------------ fontspec = fontspec or {} local fontspec = fontspec fontspec.module = { name = "fontspec", - version = "2.3c", - date = "2013/05/20", + version = "2.5", + date = "2016/01/30", description = "Advanced font selection for LuaLaTeX.", - author = "Khaled Hosny, Philipp Gesang", - copyright = "Khaled Hosny, Philipp Gesang", + author = "Khaled Hosny, Philipp Gesang, Will Robertson", + copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", license = "LPPL" } local err, warn, info, log = luatexbase.provides_module(fontspec.module) - -fontspec.log = log or (function (s) luatexbase.module_info("fontspec", s) end) +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) - -if luatexbase.catcodetables == nil then - latexpackage_catcodetable=luatexbase.registernumber("catcodetable@atletter") -else - latexpackage_catcodetable=luatexbase.catcodetables['latex-package'] -end -function fontspec.sprint (...) - tex.sprint(latexpackage_catcodetable, ...) -end +fontspec.error = err or (function (s) luatexbase.module_error("fontspec", s) end) local check_script = luaotfload.aux.provides_script local check_language = luaotfload.aux.provides_language local check_feature = luaotfload.aux.provides_feature -local function tempswatrue() fontspec.sprint([[\@tempswatrue]]) end -local function tempswafalse() fontspec.sprint([[\@tempswafalse]]) end +local function tempswatrue() tex.sprint([[\FontspecSetCheckBoolTrue ]]) end +local function tempswafalse() tex.sprint([[\FontspecSetCheckBoolFalse]]) end function fontspec.check_ot_script(fnt, script) if check_script(font.id(fnt), script) then tempswatrue() @@ -83,25 +68,16 @@ function fontspec.mathfontdimen(fnt, str) fontspec.sprint("0pt") end end --- --- Copyright 2004--2015 Will Robertson <wspr81@gmail.com> +-- ------------------------------------------------ +-- Copyright 2004--2016 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 (your choice). The latest version of --- this license is at: http://www.latex-project.org/lppl.txt +-- 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. --- --- This work consists of this file fontspec.dtx --- and the derived files fontspec.sty, --- fontspec.lua, --- fontspec.cfg, --- fontspec-xetex.sty, --- fontspec-luatex.sty, --- fontspec-patches.sty, --- fontspec-example.tex, --- and fontspec.pdf. --- +-- It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex. +-- And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf. +-- ------------------------------------------------ -- -- End of file `fontspec.lua'. |