diff options
| author | Karl Berry <karl@freefriends.org> | 2017-07-22 22:31:13 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-07-22 22:31:13 +0000 |
| commit | c1a051ec53cfe23827fc639ed064edf9d2daa469 (patch) | |
| tree | d3dfa589e5b02eb2e6eeb775e04f50027f7fd8d3 /Master/texmf-dist/source/latex/fontspec | |
| parent | 0e24314c2d151e3a9dcfcf0f2e7833c11977fdb7 (diff) | |
fontspec (22jul17)
git-svn-id: svn://tug.org/texlive/trunk@44867 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec')
| -rw-r--r-- | Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/fontspec/fontspec.dtx | 6 |
2 files changed, 5 insertions, 8 deletions
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. %<fontspec&xetexx>\ProvidesExplPackage{fontspec-xetex}% %<fontspec&luatex>\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> %<lua>fontspec = fontspec or {} %<lua>local fontspec = fontspec %<lua>fontspec.module = { %<lua> name = "fontspec", -%<lua> version = "2.6b", -%<lua> date = "2017/07/16", +%<lua> version = "2.6c", +%<lua> date = "2017/07/23", %<lua> description = "Font selection for XeLaTeX and LuaLaTeX", %<lua> author = "Khaled Hosny, Philipp Gesang, Will Robertson", %<lua> copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", |