From c1a051ec53cfe23827fc639ed064edf9d2daa469 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 22 Jul 2017 22:31:13 +0000 Subject: fontspec (22jul17) git-svn-id: svn://tug.org/texlive/trunk@44867 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fontspec/README.md | 5 +++++ Master/texmf-dist/doc/latex/fontspec/fontspec.pdf | Bin 962250 -> 962393 bytes .../source/latex/fontspec/fontspec-keyval.dtx | 7 ++----- .../texmf-dist/source/latex/fontspec/fontspec.dtx | 6 +++--- .../tex/latex/fontspec/fontspec-luatex.sty | 9 +++------ .../tex/latex/fontspec/fontspec-xetex.sty | 9 +++------ Master/texmf-dist/tex/latex/fontspec/fontspec.lua | 4 ++-- Master/texmf-dist/tex/latex/fontspec/fontspec.sty | 2 +- 8 files changed, 19 insertions(+), 23 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/fontspec/README.md b/Master/texmf-dist/doc/latex/fontspec/README.md index 2ffe16b0a95..9b42f4821d4 100644 --- a/Master/texmf-dist/doc/latex/fontspec/README.md +++ b/Master/texmf-dist/doc/latex/fontspec/README.md @@ -69,6 +69,11 @@ To add features to the font family currently in use: Change history -------------- +- v2.6c (2017/07/23) + + * Emergency bug-fix. + + - v2.6b (2017/07/16) * Fix conflict with Polyglossia and `Scale=MatchLowercase`. diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf index b4af7013e32..23056a82023 100644 Binary files a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf and b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf differ diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx index 9b2516cf26a..079713020fd 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx @@ -46,7 +46,7 @@ { \bool_set_false:N \l_@@_fontcfg_bool } -\@@_keys_define_code:nnn {fontspec-preparse-external} {NoFontCfg} +\@@_keys_define_code:nnn {fontspec-preparse-external} {IgnoreFontspecFile} { \bool_set_false:N \l_@@_fontcfg_bool } @@ -580,13 +580,10 @@ % \begin{macrocode} \@@_keys_define_code:nnn {fontspec} {HyphenChar} { - \bool_if:NT \l_@@_addfontfeatures_bool - { \@@_error:nx {not-in-addfontfeatures} {HyphenChar} } - \str_if_eq:nnTF {#1} {None} { \tl_put_right:Nn \l_@@_postadjust_tl - { \hyphenchar \font = \c_minus_one } + { \hyphenchar \font = -1 \relax } } { \tl_if_single:nTF {#1} diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx index b212234bd0b..ebcd2544c24 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx @@ -79,14 +79,14 @@ And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf. %\ProvidesExplPackage{fontspec-xetex}% %\ProvidesExplPackage{fontspec-luatex}% %<*fontspec> - {2017/07/16}{2.6b}{Font selection for XeLaTeX and LuaLaTeX} + {2017/07/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX} % %fontspec = fontspec or {} %local fontspec = fontspec %fontspec.module = { % name = "fontspec", -% version = "2.6b", -% date = "2017/07/16", +% version = "2.6c", +% date = "2017/07/23", % description = "Font selection for XeLaTeX and LuaLaTeX", % author = "Khaled Hosny, Philipp Gesang, Will Robertson", % copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index f28ab55f99a..ae0803cb57a 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -32,7 +32,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} \ProvidesExplPackage{fontspec-luatex}% - {2017/07/16}{2.6b}{Font selection for XeLaTeX and LuaLaTeX} + {2017/07/23}{2.6c}{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 @@ -1867,7 +1867,7 @@ { \bool_set_false:N \l__fontspec_fontcfg_bool } -\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {NoFontCfg} +\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {IgnoreFontspecFile} { \bool_set_false:N \l__fontspec_fontcfg_bool } @@ -2195,13 +2195,10 @@ } \__fontspec_keys_define_code:nnn {fontspec} {HyphenChar} { - \bool_if:NT \l__fontspec_addfontfeatures_bool - { \__fontspec_error:nx {not-in-addfontfeatures} {HyphenChar} } - \str_if_eq:nnTF {#1} {None} { \tl_put_right:Nn \l__fontspec_postadjust_tl - { \hyphenchar \font = \c_minus_one } + { \hyphenchar \font = -1 \relax } } { \tl_if_single:nTF {#1} diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index ddc64587645..43f2f7b9172 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty @@ -32,7 +32,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} \ProvidesExplPackage{fontspec-xetex}% - {2017/07/16}{2.6b}{Font selection for XeLaTeX and LuaLaTeX} + {2017/07/23}{2.6c}{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 @@ -1988,7 +1988,7 @@ { \bool_set_false:N \l__fontspec_fontcfg_bool } -\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {NoFontCfg} +\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {IgnoreFontspecFile} { \bool_set_false:N \l__fontspec_fontcfg_bool } @@ -2319,13 +2319,10 @@ } \__fontspec_keys_define_code:nnn {fontspec} {HyphenChar} { - \bool_if:NT \l__fontspec_addfontfeatures_bool - { \__fontspec_error:nx {not-in-addfontfeatures} {HyphenChar} } - \str_if_eq:nnTF {#1} {None} { \tl_put_right:Nn \l__fontspec_postadjust_tl - { \hyphenchar \font = \c_minus_one } + { \hyphenchar \font = -1 \relax } } { \tl_if_single:nTF {#1} diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index 7cbb0c0b31c..eba6aa99305 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua @@ -15,8 +15,8 @@ fontspec = fontspec or {} local fontspec = fontspec fontspec.module = { name = "fontspec", - version = "2.6b", - date = "2017/07/16", + version = "2.6c", + date = "2017/07/23", description = "Font selection for XeLaTeX and LuaLaTeX", author = "Khaled Hosny, Philipp Gesang, Will Robertson", copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index 783521b01e4..5576750a17d 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty @@ -13,7 +13,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} \ProvidesExplPackage{fontspec}% - {2017/07/16}{2.6b}{Font selection for XeLaTeX and LuaLaTeX} + {2017/07/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX} \sys_if_engine_luatex:T { \RequirePackage{luaotfload} \directlua{require("fontspec")} -- cgit v1.2.3