summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-19 21:17:52 +0000
committerKarl Berry <karl@freefriends.org>2019-10-19 21:17:52 +0000
commit2b3cac12f00e890153074b983e04f33643906112 (patch)
treebcb06129d89fc31417f22a91a817930fe968c91c /Master/texmf-dist/tex
parent43bfc0c09d30517099eaf942663010527478a0fc (diff)
fontspec (19oct19)
git-svn-id: svn://tug.org/texlive/trunk@52449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty44
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty38
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.lua4
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty2
4 files changed, 43 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index da486464f58..f0e42d2a378 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -41,7 +41,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-luatex}%
- {2019/03/15}{2.7c}{Font selection for XeLaTeX and LuaLaTeX}
+ {2019/10/19}{2.7d}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
@@ -371,11 +371,6 @@
{
The "cm-default" package option is obsolete.
}
-\__fontspec_msg_new:nnn {fontspec} {fakebold-only-xetex}
- {
- The "FakeBold" and "AutoFakeBold" options are only available with XeLaTeX.\\
- Option ignored.
- }
\__fontspec_msg_new:nnn {fontspec} {font-index-needs-ttc}
{
The "FontIndex" feature is only supported by TTC (TrueType Collection) fonts.\\
@@ -746,7 +741,7 @@
\exp_not:n { \DeclareRobustCommand \rmfamily }
{
\exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
- \exp_not:N \fontfamily { \l__fontspec_rmfamily_family_tl }
+ \exp_not:N \fontfamily { \exp_not:N \rmdefault }
\exp_not:N \selectfont
}
}
@@ -764,7 +759,7 @@
\exp_not:n { \DeclareRobustCommand \sffamily }
{
\exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
- \exp_not:N \fontfamily { \l__fontspec_sffamily_family_tl }
+ \exp_not:N \fontfamily { \exp_not:N \sfdefault }
\exp_not:N \selectfont
}
}
@@ -782,7 +777,7 @@
\exp_not:n { \DeclareRobustCommand \ttfamily }
{
\exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
- \exp_not:N \fontfamily { \l__fontspec_ttfamily_family_tl }
+ \exp_not:N \fontfamily { \exp_not:N \ttdefault }
\exp_not:N \selectfont
}
}
@@ -2126,7 +2121,7 @@
Renderer .choices:nn =
{Full,Node,Basic,Base,Harfbuzz,OpenType,AAT,Graphite}
{
- \int_compare:nTF {\l_keys_choice_int >= 5} { \bool_set_true:N \l__fontspec_harfbuzz_bool }
+ \int_compare:nT {\l_keys_choice_int >= 5} { \bool_set_true:N \l__fontspec_harfbuzz_bool }
\tl_set:Nx \l__fontspec_mode_tl
{
@@ -2541,7 +2536,11 @@
}
\keys_define:nn {fontspec}
{
- FakeBold .code:n = { \__fontspec_warning:n {fakebold-only-xetex} }
+ FakeBold .code:n =
+ {
+ \__fontspec_update_featstr:n {embolden=#1}
+ },
+ FakeBold .default:n = {1.5}
}
\keys_define:nn {fontspec}
{
@@ -2615,7 +2614,7 @@
\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Discretionary} {dlig} {dlig} {}
\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Contextual} {clig} {clig} {}
\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Historic} {hlig} {hlig} {}
-\__fontspec_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { +tlig } {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {TeX} {} {tlig} {}
\__fontspec_define_opentype_feature_group:n {Letters}
\__fontspec_define_opentype_feature:nnnnn {Letters} {ResetAll} {} {}
{
@@ -2998,6 +2997,7 @@
\newfontscript{CustomDefault}{latn,DFLT}
\newfontscript{Deseret}{dsrt}
\newfontscript{Devanagari}{dev2,deva}
+\newfontscript{Dogra}{dogr}
\newfontscript{Duployan}{dupl}
\newfontscript{Egyptian~Hieroglyphs}{egyp}
\newfontscript{Elbasan}{elba}
@@ -3008,9 +3008,11 @@
\newfontscript{Grantha}{gran}
\newfontscript{Greek}{grek}
\newfontscript{Gujarati}{gjr2,gujr}
+\newfontscript{Gunjala~Gondi}{gong}
\newfontscript{Gurmukhi}{gur2,guru}
\newfontscript{Hangul~Jamo}{jamo}
\newfontscript{Hangul}{hang}
+\newfontscript{Hanifi~Rohingya}{rohg}
\newfontscript{Hanunoo}{hano}
\newfontscript{Hatran}{hatr}
\newfontscript{Hebrew}{hebr}
@@ -3036,11 +3038,14 @@
\newfontscript{Lycian}{lyci}
\newfontscript{Lydian}{lydi}
\newfontscript{Mahajani}{mahj}
+\newfontscript{Makasar}{maka}
\newfontscript{Malayalam}{mlm2,mlym}
\newfontscript{Mandaic}{mand}
\newfontscript{Manichaean}{mani}
\newfontscript{Marchen}{marc}
+\newfontscript{Masaram Gondi}{gonm}
\newfontscript{Math}{math}
+\newfontscript{Medefaidrin}{medf}
\newfontscript{Meitei~Mayek}{mtei}
\newfontscript{Mende~Kikakui}{mend}
\newfontscript{Meroitic~Cursive}{merc}
@@ -3055,6 +3060,7 @@
\newfontscript{N'Ko}{nko~}
\newfontscript{Nabataean}{nbat}
\newfontscript{Newa}{newa}
+\newfontscript{Nushu}{nshu}
\newfontscript{Odia}{ory2,orya}
\newfontscript{Ogham}{ogam}
\newfontscript{Ol~Chiki}{olck}
@@ -3063,6 +3069,7 @@
\newfontscript{Old~North~Arabian}{narb}
\newfontscript{Old~Permic}{perm}
\newfontscript{Old~Persian~Cuneiform}{xpeo}
+\newfontscript{Old~Sogdian}{sogo}
\newfontscript{Old~South~Arabian}{sarb}
\newfontscript{Old~Turkic}{orkh}
\newfontscript{Osage}{osge}
@@ -3082,6 +3089,7 @@
\newfontscript{Siddham}{sidd}
\newfontscript{Sign~Writing}{sgnw}
\newfontscript{Sinhala}{sinh}
+\newfontscript{Sogdian}{sogd}
\newfontscript{Sora~Sompeng}{sora}
\newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
\newfontscript{Sundanese}{sund}
@@ -3106,6 +3114,7 @@
\newfontscript{Vai}{vai~}
\newfontscript{Warang~Citi}{wara}
\newfontscript{Yi}{yi~~}
+\newfontscript{Zanabazar~Square}{zanb}
\newfontscript{CJK}{hani}
\newfontscript{Kana}{kana}
\newfontscript{Maths}{math}
@@ -3503,18 +3512,11 @@
%%^^A%% fontspec-code-enc.dtx -- part of FONTSPEC <wspr.io/fontspec>
-\providecommand\UnicodeFontFile[2]{"[#1]:#2"}
-\providecommand\UnicodeFontName[2]{"#1:#2"}
-\providecommand\UnicodeFontTeXLigatures{+tlig;}
-\providecommand\add@unicode@accent[2]{#2\char#1\relax}
-\providecommand\DeclareUnicodeAccent[3]{%
- \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
-}
-\DeclareDocumentCommand \EncodingCommand {mO{}m}
+\DeclareDocumentCommand \EncodingCommand { m O{} O{} m }
{
\bool_if:NF \l__fontspec_defining_encoding_bool
{ \__fontspec_error:nn {only-inside-encdef} \EncodingCommand }
- \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2]{#3}
+ \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2][#3]{#4}
}
\DeclareDocumentCommand \EncodingAccent {mm}
{
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index 84672a8a2f3..aa8ad7dc05d 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -41,7 +41,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-xetex}%
- {2019/03/15}{2.7c}{Font selection for XeLaTeX and LuaLaTeX}
+ {2019/10/19}{2.7d}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
@@ -371,11 +371,6 @@
{
The "cm-default" package option is obsolete.
}
-\__fontspec_msg_new:nnn {fontspec} {fakebold-only-xetex}
- {
- The "FakeBold" and "AutoFakeBold" options are only available with XeLaTeX.\\
- Option ignored.
- }
\__fontspec_msg_new:nnn {fontspec} {font-index-needs-ttc}
{
The "FontIndex" feature is only supported by TTC (TrueType Collection) fonts.\\
@@ -739,7 +734,7 @@
\exp_not:n { \DeclareRobustCommand \rmfamily }
{
\exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
- \exp_not:N \fontfamily { \l__fontspec_rmfamily_family_tl }
+ \exp_not:N \fontfamily { \exp_not:N \rmdefault }
\exp_not:N \selectfont
}
}
@@ -757,7 +752,7 @@
\exp_not:n { \DeclareRobustCommand \sffamily }
{
\exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
- \exp_not:N \fontfamily { \l__fontspec_sffamily_family_tl }
+ \exp_not:N \fontfamily { \exp_not:N \sfdefault }
\exp_not:N \selectfont
}
}
@@ -775,7 +770,7 @@
\exp_not:n { \DeclareRobustCommand \ttfamily }
{
\exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
- \exp_not:N \fontfamily { \l__fontspec_ttfamily_family_tl }
+ \exp_not:N \fontfamily { \exp_not:N \ttdefault }
\exp_not:N \selectfont
}
}
@@ -2555,7 +2550,6 @@
{ \__fontspec_primitive_font_set_hyphenchar:Nn \font {-1} }
}
{
- \__fontspec_warning:nx {only-xetex-feature} {HyphenChar}
\tl_if_single:nTF {#1}
{ \tl_set:Nn \l__fontspec_hyphenchar_tl {`#1} }
@@ -2749,9 +2743,8 @@
\keys_define:nn {fontspec-opentype}
{
Ligatures / TeX .code:n = { \tl_set:Nn \l__fontspec_mapping_tl {tex-text} },
- Ligatures / TeX .groups:n = {opentype},
+ Ligatures / TeXOff .code:n = { \tl_clear:N \l__fontspec_mapping_tl },
Ligatures / TeXReset .code:n = { \tl_clear:N \l__fontspec_mapping_tl },
- Ligatures / TeXReset .groups:n = {opentype},
}
\__fontspec_define_opentype_feature_group:n {Letters}
\__fontspec_define_opentype_feature:nnnnn {Letters} {ResetAll} {} {}
@@ -3129,6 +3122,7 @@
\newfontscript{CustomDefault}{latn,DFLT}
\newfontscript{Deseret}{dsrt}
\newfontscript{Devanagari}{dev2,deva}
+\newfontscript{Dogra}{dogr}
\newfontscript{Duployan}{dupl}
\newfontscript{Egyptian~Hieroglyphs}{egyp}
\newfontscript{Elbasan}{elba}
@@ -3139,9 +3133,11 @@
\newfontscript{Grantha}{gran}
\newfontscript{Greek}{grek}
\newfontscript{Gujarati}{gjr2,gujr}
+\newfontscript{Gunjala~Gondi}{gong}
\newfontscript{Gurmukhi}{gur2,guru}
\newfontscript{Hangul~Jamo}{jamo}
\newfontscript{Hangul}{hang}
+\newfontscript{Hanifi~Rohingya}{rohg}
\newfontscript{Hanunoo}{hano}
\newfontscript{Hatran}{hatr}
\newfontscript{Hebrew}{hebr}
@@ -3167,11 +3163,14 @@
\newfontscript{Lycian}{lyci}
\newfontscript{Lydian}{lydi}
\newfontscript{Mahajani}{mahj}
+\newfontscript{Makasar}{maka}
\newfontscript{Malayalam}{mlm2,mlym}
\newfontscript{Mandaic}{mand}
\newfontscript{Manichaean}{mani}
\newfontscript{Marchen}{marc}
+\newfontscript{Masaram Gondi}{gonm}
\newfontscript{Math}{math}
+\newfontscript{Medefaidrin}{medf}
\newfontscript{Meitei~Mayek}{mtei}
\newfontscript{Mende~Kikakui}{mend}
\newfontscript{Meroitic~Cursive}{merc}
@@ -3186,6 +3185,7 @@
\newfontscript{N'Ko}{nko~}
\newfontscript{Nabataean}{nbat}
\newfontscript{Newa}{newa}
+\newfontscript{Nushu}{nshu}
\newfontscript{Odia}{ory2,orya}
\newfontscript{Ogham}{ogam}
\newfontscript{Ol~Chiki}{olck}
@@ -3194,6 +3194,7 @@
\newfontscript{Old~North~Arabian}{narb}
\newfontscript{Old~Permic}{perm}
\newfontscript{Old~Persian~Cuneiform}{xpeo}
+\newfontscript{Old~Sogdian}{sogo}
\newfontscript{Old~South~Arabian}{sarb}
\newfontscript{Old~Turkic}{orkh}
\newfontscript{Osage}{osge}
@@ -3213,6 +3214,7 @@
\newfontscript{Siddham}{sidd}
\newfontscript{Sign~Writing}{sgnw}
\newfontscript{Sinhala}{sinh}
+\newfontscript{Sogdian}{sogd}
\newfontscript{Sora~Sompeng}{sora}
\newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
\newfontscript{Sundanese}{sund}
@@ -3237,6 +3239,7 @@
\newfontscript{Vai}{vai~}
\newfontscript{Warang~Citi}{wara}
\newfontscript{Yi}{yi~~}
+\newfontscript{Zanabazar~Square}{zanb}
\newfontscript{CJK}{hani}
\newfontscript{Kana}{kana}
\newfontscript{Maths}{math}
@@ -3771,18 +3774,11 @@
%%^^A%% fontspec-code-enc.dtx -- part of FONTSPEC <wspr.io/fontspec>
-\providecommand\UnicodeFontFile[2]{"[#1]:#2"}
-\providecommand\UnicodeFontName[2]{"#1:#2"}
-\providecommand\UnicodeFontTeXLigatures{mapping=tex-text;}
-\providecommand\add@unicode@accent[2]{#2\char#1\relax}
-\providecommand\DeclareUnicodeAccent[3]{%
- \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
-}
-\DeclareDocumentCommand \EncodingCommand {mO{}m}
+\DeclareDocumentCommand \EncodingCommand { m O{} O{} m }
{
\bool_if:NF \l__fontspec_defining_encoding_bool
{ \__fontspec_error:nn {only-inside-encdef} \EncodingCommand }
- \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2]{#3}
+ \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2][#3]{#4}
}
\DeclareDocumentCommand \EncodingAccent {mm}
{
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 2b8f73a8436..edd69967a05 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -23,8 +23,8 @@ fontspec = fontspec or {}
local fontspec = fontspec
fontspec.module = {
name = "fontspec",
- version = "2.7c",
- date = "2019/03/15",
+ version = "2.7d",
+ date = "2019/10/19",
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 6a0eace2473..ebc2bb923ba 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -21,7 +21,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec}%
- {2019/03/15}{2.7c}{Font selection for XeLaTeX and LuaLaTeX}
+ {2019/10/19}{2.7d}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
\sys_if_engine_luatex:T