diff options
author | Karl Berry <karl@freefriends.org> | 2017-08-14 20:29:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-08-14 20:29:00 +0000 |
commit | f53ceb53f2f9a1c59d808cc85ac7651a6de78a17 (patch) | |
tree | ec9011d57080ca50bcde547440c153b20dd311e4 /Master/texmf-dist/tex | |
parent | cb92e524d778229884d461b7ac8710f6a3150e4b (diff) |
fontspec (14aug17)
git-svn-id: svn://tug.org/texlive/trunk@45042 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 166 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index ae0803cb57a..54bb94c2835 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/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX} + {2017/08/14}{2.6d}{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 @@ -2195,24 +2195,25 @@ } \__fontspec_keys_define_code:nnn {fontspec} {HyphenChar} { + \__fontspec_warning:nx {only-xetex-feature} {HyphenChar} \str_if_eq:nnTF {#1} {None} { \tl_put_right:Nn \l__fontspec_postadjust_tl { \hyphenchar \font = -1 \relax } } { + \tl_if_single:nTF {#1} { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} } { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} } + \__fontspec_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl} { \tl_put_right:Nn \l__fontspec_postadjust_tl - { - \hyphenchar \font = \c_zero - \int_set:Nn \luatex_prehyphenchar:D { \l_fontspec_hyphenchar_tl } - } + { \hyphenchar \font = \l_fontspec_hyphenchar_tl \scan_stop: } } { \__fontspec_error:nx {no-glyph}{#1} } + } } \__fontspec_aff_error:n {HyphenChar} @@ -2714,16 +2715,29 @@ \__fontspec_ot_compat:nn {Diacritics} {AboveBase} \__fontspec_ot_compat:nn {Diacritics} {BelowBase} +\newfontscript{Adlam}{adlm} +\newfontscript{Ahom}{ahom} +\newfontscript{Anatolian~Hieroglyphs}{hluw} \newfontscript{Arabic}{arab} \newfontscript{Armenian}{armn} +\newfontscript{Avestan}{avst} \newfontscript{Balinese}{bali} +\newfontscript{Bamum}{bamu} +\newfontscript{Bassa~Vah}{bass} +\newfontscript{Batak}{batk} \newfontscript{Bengali}{bng2,beng} +\newfontscript{Bhaiksuki}{bhks} \newfontscript{Bopomofo}{bopo} +\newfontscript{Brahmi}{brah} \newfontscript{Braille}{brai} \newfontscript{Buginese}{bugi} \newfontscript{Buhid}{buhd} \newfontscript{Byzantine~Music}{byzm} \newfontscript{Canadian~Syllabics}{cans} +\newfontscript{Carian}{cari} +\newfontscript{Caucasian~Albanian}{aghb} +\newfontscript{Chakma}{cakm} +\newfontscript{Cham}{cham} \newfontscript{Cherokee}{cher} \newfontscript{CJK~Ideographic}{hani} \newfontscript{Coptic}{copt} @@ -2732,60 +2746,119 @@ \newfontscript{Default}{DFLT} \newfontscript{Deseret}{dsrt} \newfontscript{Devanagari}{dev2,deva} +\newfontscript{Duployan}{dupl} +\newfontscript{Egyptian~Hieroglyphs}{egyp} +\newfontscript{Elbasan}{elba} \newfontscript{Ethiopic}{ethi} \newfontscript{Georgian}{geor} \newfontscript{Glagolitic}{glag} \newfontscript{Gothic}{goth} +\newfontscript{Grantha}{gran} \newfontscript{Greek}{grek} \newfontscript{Gujarati}{gjr2,gujr} \newfontscript{Gurmukhi}{gur2,guru} \newfontscript{Hangul~Jamo}{jamo} \newfontscript{Hangul}{hang} \newfontscript{Hanunoo}{hano} +\newfontscript{Hatran}{hatr} \newfontscript{Hebrew}{hebr} \newfontscript{Hiragana~and~Katakana}{kana} +\newfontscript{Imperial~Aramaic}{armi} +\newfontscript{Inscriptional~Pahlavi}{phli} +\newfontscript{Inscriptional~Parthian}{prti} \newfontscript{Javanese}{java} +\newfontscript{Kaithi}{kthi} \newfontscript{Kannada}{knd2,knda} +\newfontscript{Kayah~Li}{kali} \newfontscript{Kharosthi}{khar} \newfontscript{Khmer}{khmr} +\newfontscript{Khojki}{khoj} +\newfontscript{Khudawadi}{sind} \newfontscript{Lao}{lao~} \newfontscript{Latin}{latn} +\newfontscript{Lepcha}{lepc} \newfontscript{Limbu}{limb} +\newfontscript{Linear~A}{lina} \newfontscript{Linear~B}{linb} +\newfontscript{Lisu}{lisu} +\newfontscript{Lycian}{lyci} +\newfontscript{Lydian}{lydi} +\newfontscript{Mahajani}{mahj} \newfontscript{Malayalam}{mlm2,mlym} +\newfontscript{Mandaic}{mand} +\newfontscript{Manichaean}{mani} +\newfontscript{Marchen}{marc} \newfontscript{Math}{math} +\newfontscript{Meitei~Mayek}{mtei} +\newfontscript{Mende~Kikakui}{mend} +\newfontscript{Meroitic~Cursive}{merc} +\newfontscript{Meroitic~Hieroglyphs}{mero} +\newfontscript{Miao}{plrd} +\newfontscript{Modi}{modi} \newfontscript{Mongolian}{mong} +\newfontscript{Mro}{mroo} +\newfontscript{Multani}{mult} \newfontscript{Musical~Symbols}{musc} -\newfontscript{Myanmar}{mymr} -\newfontscript{N'ko}{nko~} +\newfontscript{Myanmar}{mym2,mymr} +\newfontscript{N'Ko}{nko~} +\newfontscript{Nabataean}{nbat} +\newfontscript{Newa}{newa} +\newfontscript{Odia}{ory2,orya} \newfontscript{Ogham}{ogam} +\newfontscript{Ol~Chiki}{olck} \newfontscript{Old~Italic}{ital} +\newfontscript{Old~Hungarian}{hung} +\newfontscript{Old~North~Arabian}{narb} +\newfontscript{Old~Permic}{perm} \newfontscript{Old~Persian~Cuneiform}{xpeo} -\newfontscript{Oriya}{ory2,orya} +\newfontscript{Old~South~Arabian}{sarb} +\newfontscript{Old~Turkic}{orkh} +\newfontscript{Osage}{osge} \newfontscript{Osmanya}{osma} +\newfontscript{Pahawh~Hmong}{hmng} +\newfontscript{Palmyrene}{palm} +\newfontscript{Pau~Cin~Hau}{pauc} \newfontscript{Phags-pa}{phag} \newfontscript{Phoenician}{phnx} +\newfontscript{Psalter~Pahlavi}{phlp} +\newfontscript{Rejang}{rjng} \newfontscript{Runic}{runr} +\newfontscript{Samaritan}{samr} +\newfontscript{Saurashtra}{saur} +\newfontscript{Sharada}{shrd} \newfontscript{Shavian}{shaw} +\newfontscript{Siddham}{sidd} +\newfontscript{Sign~Writing}{sgnw} \newfontscript{Sinhala}{sinh} +\newfontscript{Sora~Sompeng}{sora} \newfontscript{Sumero-Akkadian~Cuneiform}{xsux} +\newfontscript{Sundanese}{sund} \newfontscript{Syloti~Nagri}{sylo} \newfontscript{Syriac}{syrc} \newfontscript{Tagalog}{tglg} \newfontscript{Tagbanwa}{tagb} \newfontscript{Tai~Le}{tale} \newfontscript{Tai~Lu}{talu} +\newfontscript{Tai~Tham}{lana} +\newfontscript{Tai~Viet}{tavt} +\newfontscript{Takri}{takr} \newfontscript{Tamil}{tml2,taml} +\newfontscript{Tangut}{tang} \newfontscript{Telugu}{tel2,telu} \newfontscript{Thaana}{thaa} \newfontscript{Thai}{thai} \newfontscript{Tibetan}{tibt} \newfontscript{Tifinagh}{tfng} +\newfontscript{Tirhuta}{tirh} \newfontscript{Ugaritic~Cuneiform}{ugar} +\newfontscript{Vai}{vai~} +\newfontscript{Warang~Citi}{wara} \newfontscript{Yi}{yi~~} +\newfontscript{CJK}{hani} \newfontscript{Kana}{kana} \newfontscript{Maths}{math} -\newfontscript{CJK}{hani} +\newfontscript{N'ko}{nko~} +\newfontscript{Oriya}{ory2,orya} \newfontlanguage{Abaza}{ABA} \newfontlanguage{Abkhazian}{ABK} diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index 43f2f7b9172..6ff78f06dbb 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/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX} + {2017/08/14}{2.6d}{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 @@ -2319,21 +2319,25 @@ } \__fontspec_keys_define_code:nnn {fontspec} {HyphenChar} { + \__fontspec_warning:nx {only-xetex-feature} {HyphenChar} \str_if_eq:nnTF {#1} {None} { \tl_put_right:Nn \l__fontspec_postadjust_tl { \hyphenchar \font = -1 \relax } } { + \tl_if_single:nTF {#1} { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} } { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} } + \__fontspec_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl} { \tl_put_right:Nn \l__fontspec_postadjust_tl { \hyphenchar \font = \l_fontspec_hyphenchar_tl \scan_stop: } } { \__fontspec_error:nx {no-glyph}{#1} } + } } \__fontspec_aff_error:n {HyphenChar} @@ -2852,16 +2856,29 @@ \__fontspec_ot_compat:nn {Diacritics} {AboveBase} \__fontspec_ot_compat:nn {Diacritics} {BelowBase} +\newfontscript{Adlam}{adlm} +\newfontscript{Ahom}{ahom} +\newfontscript{Anatolian~Hieroglyphs}{hluw} \newfontscript{Arabic}{arab} \newfontscript{Armenian}{armn} +\newfontscript{Avestan}{avst} \newfontscript{Balinese}{bali} +\newfontscript{Bamum}{bamu} +\newfontscript{Bassa~Vah}{bass} +\newfontscript{Batak}{batk} \newfontscript{Bengali}{bng2,beng} +\newfontscript{Bhaiksuki}{bhks} \newfontscript{Bopomofo}{bopo} +\newfontscript{Brahmi}{brah} \newfontscript{Braille}{brai} \newfontscript{Buginese}{bugi} \newfontscript{Buhid}{buhd} \newfontscript{Byzantine~Music}{byzm} \newfontscript{Canadian~Syllabics}{cans} +\newfontscript{Carian}{cari} +\newfontscript{Caucasian~Albanian}{aghb} +\newfontscript{Chakma}{cakm} +\newfontscript{Cham}{cham} \newfontscript{Cherokee}{cher} \newfontscript{CJK~Ideographic}{hani} \newfontscript{Coptic}{copt} @@ -2870,60 +2887,119 @@ \newfontscript{Default}{DFLT} \newfontscript{Deseret}{dsrt} \newfontscript{Devanagari}{dev2,deva} +\newfontscript{Duployan}{dupl} +\newfontscript{Egyptian~Hieroglyphs}{egyp} +\newfontscript{Elbasan}{elba} \newfontscript{Ethiopic}{ethi} \newfontscript{Georgian}{geor} \newfontscript{Glagolitic}{glag} \newfontscript{Gothic}{goth} +\newfontscript{Grantha}{gran} \newfontscript{Greek}{grek} \newfontscript{Gujarati}{gjr2,gujr} \newfontscript{Gurmukhi}{gur2,guru} \newfontscript{Hangul~Jamo}{jamo} \newfontscript{Hangul}{hang} \newfontscript{Hanunoo}{hano} +\newfontscript{Hatran}{hatr} \newfontscript{Hebrew}{hebr} \newfontscript{Hiragana~and~Katakana}{kana} +\newfontscript{Imperial~Aramaic}{armi} +\newfontscript{Inscriptional~Pahlavi}{phli} +\newfontscript{Inscriptional~Parthian}{prti} \newfontscript{Javanese}{java} +\newfontscript{Kaithi}{kthi} \newfontscript{Kannada}{knd2,knda} +\newfontscript{Kayah~Li}{kali} \newfontscript{Kharosthi}{khar} \newfontscript{Khmer}{khmr} +\newfontscript{Khojki}{khoj} +\newfontscript{Khudawadi}{sind} \newfontscript{Lao}{lao~} \newfontscript{Latin}{latn} +\newfontscript{Lepcha}{lepc} \newfontscript{Limbu}{limb} +\newfontscript{Linear~A}{lina} \newfontscript{Linear~B}{linb} +\newfontscript{Lisu}{lisu} +\newfontscript{Lycian}{lyci} +\newfontscript{Lydian}{lydi} +\newfontscript{Mahajani}{mahj} \newfontscript{Malayalam}{mlm2,mlym} +\newfontscript{Mandaic}{mand} +\newfontscript{Manichaean}{mani} +\newfontscript{Marchen}{marc} \newfontscript{Math}{math} +\newfontscript{Meitei~Mayek}{mtei} +\newfontscript{Mende~Kikakui}{mend} +\newfontscript{Meroitic~Cursive}{merc} +\newfontscript{Meroitic~Hieroglyphs}{mero} +\newfontscript{Miao}{plrd} +\newfontscript{Modi}{modi} \newfontscript{Mongolian}{mong} +\newfontscript{Mro}{mroo} +\newfontscript{Multani}{mult} \newfontscript{Musical~Symbols}{musc} -\newfontscript{Myanmar}{mymr} -\newfontscript{N'ko}{nko~} +\newfontscript{Myanmar}{mym2,mymr} +\newfontscript{N'Ko}{nko~} +\newfontscript{Nabataean}{nbat} +\newfontscript{Newa}{newa} +\newfontscript{Odia}{ory2,orya} \newfontscript{Ogham}{ogam} +\newfontscript{Ol~Chiki}{olck} \newfontscript{Old~Italic}{ital} +\newfontscript{Old~Hungarian}{hung} +\newfontscript{Old~North~Arabian}{narb} +\newfontscript{Old~Permic}{perm} \newfontscript{Old~Persian~Cuneiform}{xpeo} -\newfontscript{Oriya}{ory2,orya} +\newfontscript{Old~South~Arabian}{sarb} +\newfontscript{Old~Turkic}{orkh} +\newfontscript{Osage}{osge} \newfontscript{Osmanya}{osma} +\newfontscript{Pahawh~Hmong}{hmng} +\newfontscript{Palmyrene}{palm} +\newfontscript{Pau~Cin~Hau}{pauc} \newfontscript{Phags-pa}{phag} \newfontscript{Phoenician}{phnx} +\newfontscript{Psalter~Pahlavi}{phlp} +\newfontscript{Rejang}{rjng} \newfontscript{Runic}{runr} +\newfontscript{Samaritan}{samr} +\newfontscript{Saurashtra}{saur} +\newfontscript{Sharada}{shrd} \newfontscript{Shavian}{shaw} +\newfontscript{Siddham}{sidd} +\newfontscript{Sign~Writing}{sgnw} \newfontscript{Sinhala}{sinh} +\newfontscript{Sora~Sompeng}{sora} \newfontscript{Sumero-Akkadian~Cuneiform}{xsux} +\newfontscript{Sundanese}{sund} \newfontscript{Syloti~Nagri}{sylo} \newfontscript{Syriac}{syrc} \newfontscript{Tagalog}{tglg} \newfontscript{Tagbanwa}{tagb} \newfontscript{Tai~Le}{tale} \newfontscript{Tai~Lu}{talu} +\newfontscript{Tai~Tham}{lana} +\newfontscript{Tai~Viet}{tavt} +\newfontscript{Takri}{takr} \newfontscript{Tamil}{tml2,taml} +\newfontscript{Tangut}{tang} \newfontscript{Telugu}{tel2,telu} \newfontscript{Thaana}{thaa} \newfontscript{Thai}{thai} \newfontscript{Tibetan}{tibt} \newfontscript{Tifinagh}{tfng} +\newfontscript{Tirhuta}{tirh} \newfontscript{Ugaritic~Cuneiform}{ugar} +\newfontscript{Vai}{vai~} +\newfontscript{Warang~Citi}{wara} \newfontscript{Yi}{yi~~} +\newfontscript{CJK}{hani} \newfontscript{Kana}{kana} \newfontscript{Maths}{math} -\newfontscript{CJK}{hani} +\newfontscript{N'ko}{nko~} +\newfontscript{Oriya}{ory2,orya} \newfontlanguage{Abaza}{ABA} \newfontlanguage{Abkhazian}{ABK} diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index eba6aa99305..ceac6a80f5d 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.6c", - date = "2017/07/23", + version = "2.6d", + date = "2017/08/14", 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 5576750a17d..993f4428f6c 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/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX} + {2017/08/14}{2.6d}{Font selection for XeLaTeX and LuaLaTeX} \sys_if_engine_luatex:T { \RequirePackage{luaotfload} \directlua{require("fontspec")} |