summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-01 23:06:16 +0000
committerKarl Berry <karl@freefriends.org>2016-02-01 23:06:16 +0000
commit61ebb8b69624b4931744ae78792435da9cfdf4c9 (patch)
tree1ac78806e589a4e2e2c0e326b2b5a642b1f1d0f0 /Master/texmf-dist/tex/latex/fontspec
parent56ded4aa6c33b2ea2dedafe929e2069ed9f6d008 (diff)
fontspec (2feb16)
git-svn-id: svn://tug.org/texlive/trunk@39541 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty4
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.cfg21
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.lua22
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty22
5 files changed, 42 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index dcdc34485e9..da5b9ac1558 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -24,7 +24,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-luatex}%
- {2016/01/30}{2.5}{Font selection for XeLaTeX and LuaLaTeX}
+ {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
\bool_new:N \l__fontspec_firsttime_bool
\bool_new:N \l__fontspec_nobf_bool
\bool_new:N \l__fontspec_noit_bool
@@ -1951,7 +1951,7 @@
{
Ligatures / TeX .code:n =
{
- \__fontspec_update_featstr:n { +tlig; +trep }
+ \__fontspec_update_featstr:n { +tlig }
}
}
\__fontspec_define_font_feature:n{Letters}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index e116c14c8bc..272a2f4257c 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -24,7 +24,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-xetex}%
- {2016/01/30}{2.5}{Font selection for XeLaTeX and LuaLaTeX}
+ {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
\bool_new:N \l__fontspec_firsttime_bool
\bool_new:N \l__fontspec_nobf_bool
\bool_new:N \l__fontspec_noit_bool
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.cfg b/Master/texmf-dist/tex/latex/fontspec/fontspec.cfg
new file mode 100644
index 00000000000..3301e3eb594
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.cfg
@@ -0,0 +1,21 @@
+
+%%% FONTSPEC.CFG %%%
+%
+% This configuration file sets up TeX Ligatures by default for all fonts loaded
+% with `\setmainfont` and `\setsansfont`.
+%
+% In addition, `\setmonofont` has default features to enforce "monospace"
+% settings with regard to space stretchability and shrinkability.
+%
+% Make a copy of this file in your own home TEXMF directory to set up your own
+% defaults.
+
+
+\defaultfontfeatures
+ [\rmfamily,\sffamily]
+ {Ligatures=TeX}
+
+\defaultfontfeatures
+ [\ttfamily]
+ {WordSpace={1,0,0},
+ PunctuationSpace=WordSpace}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index ec0b8a171e2..0d3b3c170ce 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -14,8 +14,8 @@ fontspec = fontspec or {}
local fontspec = fontspec
fontspec.module = {
name = "fontspec",
- version = "2.5",
- date = "2016/01/30",
+ version = "2.5a",
+ date = "2016/02/01",
description = "Advanced font selection for LuaLaTeX.",
author = "Khaled Hosny, Philipp Gesang, Will Robertson",
copyright = "Khaled Hosny, Philipp Gesang, Will Robertson",
@@ -26,20 +26,17 @@ 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 check_script = luaotfload.aux.provides_script
-local check_language = luaotfload.aux.provides_language
-local check_feature = luaotfload.aux.provides_feature
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
+ if luaotfload.aux.provides_script(font.id(fnt), script) then
tempswatrue()
else
tempswafalse()
end
end
function fontspec.check_ot_lang(fnt, lang, script)
- if check_language(font.id(fnt), script, lang) then
+ if luaotfload.aux.provides_language(font.id(fnt), script, lang) then
tempswatrue()
else
tempswafalse()
@@ -52,20 +49,19 @@ function fontspec.check_ot_feat(fnt, feat, lang, script)
return
end
end
- if check_feature(font.id(fnt), script, lang, feat) then
+ if luaotfload.aux.provides_feature(font.id(fnt), script, lang, feat) then
tempswatrue()
else
tempswafalse()
end
end
-local get_math_dimension = luaotfload.aux.get_math_dimension
function fontspec.mathfontdimen(fnt, str)
- local mathdimens = get_math_dimension(fnt, str)
+ local mathdimens = luaotfload.aux.get_math_dimension(fnt, str)
if mathdimens then
- fontspec.sprint(mathdimens)
- fontspec.sprint("sp")
+ tex.sprint(mathdimens)
+ tex.sprint("sp")
else
- fontspec.sprint("0pt")
+ tex.sprint("0pt")
end
end
-- ------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index afa682999de..c50a7097202 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -13,23 +13,19 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec}%
- {2016/01/30}{2.5}{Font selection for XeLaTeX and LuaLaTeX}
+ {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
+\sys_if_engine_luatex:T
+ { \RequirePackage{luaotfload}
+ \directlua{require("fontspec")}
+ \RequirePackageWithOptions{fontspec-luatex} \endinput }
+\sys_if_engine_xetex:T
+ { \RequirePackageWithOptions{fontspec-xetex} \endinput }
\msg_new:nnn {fontspec} {cannot-use-pdftex}
{
- The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX~ to~ function.\\\\
+ The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\
You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ "xelatex"~ or~ "lualatex" instead~ of~ plain~ "latex"~ or~ "pdflatex".
}
-\sys_if_engine_xetex:F
- {
- \sys_if_engine_luatex:F { \msg_fatal:nn {fontspec} {cannot-use-pdftex} }
- }
-\sys_if_engine_luatex:T
- {
- \RequirePackage{luaotfload}[2013/05/20]
- \directlua{require("fontspec")}
- }
-\sys_if_engine_luatex:T { \RequirePackageWithOptions{fontspec-luatex} }
-\sys_if_engine_xetex:T { \RequirePackageWithOptions{fontspec-xetex} }
+\msg_fatal:nn {fontspec} {cannot-use-pdftex}
%% ------------------------------------------------
%% Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
%% Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>