summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty86
1 files changed, 43 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index e8a7d357965..c20dbb3ad22 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -8,13 +8,13 @@
%%
%% _________________________________________
%% The fontspec package for XeLaTeX/LuaLaTeX
-%% (C) 2004--2013 Will Robertson and Khaled Hosny
+%% (C) 2004--2014 Will Robertson and Khaled Hosny
%%
%% License information appended.
%%
%%
\ProvidesPackage{fontspec}
- [2013/05/20 v2.3c Font selection for XeLaTeX and LuaLaTeX]
+ [2014/06/01 v2.4 Font selection for XeLaTeX and LuaLaTeX]
\RequirePackage{expl3}[2011/09/05]
@@ -39,28 +39,28 @@
\msg_fatal:nn {fontspec} {cannot-use-pdftex}
}
}
-\bool_new:N \l_fontspec_firsttime_bool
-\bool_new:N \l_fontspec_nobf_bool
-\bool_new:N \l_fontspec_noit_bool
-\bool_new:N \l_fontspec_nosc_bool
-\bool_new:N \l_fontspec_tfm_bool
-\bool_new:N \l_fontspec_atsui_bool
-\bool_new:N \l_fontspec_icu_bool
-\bool_new:N \l_fontspec_mm_bool
-\bool_new:N \l_fontspec_graphite_bool
-\bool_new:N \g_fontspec_math_euler_bool
-\bool_new:N \g_fontspec_math_lucida_bool
-\bool_new:N \g_fontspec_package_euler_loaded_bool
-\bool_new:N \g_fontspec_cfg_bool
-\bool_new:N \g_fontspec_math_bool
+\bool_new:N \l__fontspec_firsttime_bool
+\bool_new:N \l__fontspec_nobf_bool
+\bool_new:N \l__fontspec_noit_bool
+\bool_new:N \l__fontspec_nosc_bool
+\bool_new:N \l__fontspec_tfm_bool
+\bool_new:N \l__fontspec_atsui_bool
+\bool_new:N \l__fontspec_ot_bool
+\bool_new:N \l__fontspec_mm_bool
+\bool_new:N \l__fontspec_graphite_bool
+\bool_new:N \g__fontspec_math_euler_bool
+\bool_new:N \g__fontspec_math_lucida_bool
+\bool_new:N \g__fontspec_pkg_euler_loaded_bool
+\bool_new:N \g__fontspec_cfg_bool
+\bool_new:N \g__fontspec_math_bool
\int_new:N \l_fontspec_script_int
\int_new:N \l_fontspec_language_int
\int_new:N \l_fontspec_strnum_int
-\fp_new:N \l_fontspec_tmpa_fp
-\fp_new:N \l_fontspec_tmpb_fp
-\dim_new:N \l_fontspec_tmpa_dim
-\dim_new:N \l_fontspec_tmpb_dim
-\dim_new:N \l_fontspec_tmpc_dim
+\fp_new:N \l__fontspec_tmpa_fp
+\fp_new:N \l__fontspec_tmpb_fp
+\dim_new:N \l__fontspec_tmpa_dim
+\dim_new:N \l__fontspec_tmpb_dim
+\dim_new:N \l__fontspec_tmpc_dim
\tl_set:Nx \c_colon_str { \tl_to_str:N : }
\cs_set:Npn \use_v:nnnnn #1#2#3#4#5 {#5}
\cs_set:Npn \use_iv:nnnnn #1#2#3#4#5 {#4}
@@ -69,19 +69,19 @@
\cs_generate_variant:Nn \tl_gset:Nn {cV}
\cs_generate_variant:Nn \keys_set:nn {nx}
\cs_generate_variant:Nn \keys_set_known:nnN {nx}
-\cs_new:Nn \_int_mult_truncate:Nn
+\cs_new:Nn \__fontspec_int_mult_truncate:Nn
{
- \int_set:Nn #1 { \dim_eval:w #2 #1 \dim_eval_end: }
+ \int_set:Nn #1 { \__dim_eval:w #2 #1 \__dim_eval_end: }
}
-\cs_new:Npn \fontspec_error:n { \msg_error:nn {fontspec} }
-\cs_new:Npn \fontspec_error:nx { \msg_error:nnx {fontspec} }
-\cs_new:Npn \fontspec_warning:n { \msg_warning:nn {fontspec} }
-\cs_new:Npn \fontspec_warning:nx { \msg_warning:nnx {fontspec} }
-\cs_new:Npn \fontspec_warning:nxx { \msg_warning:nnxx {fontspec} }
-\cs_new:Npn \fontspec_info:n { \msg_info:nn {fontspec} }
-\cs_new:Npn \fontspec_info:nx { \msg_info:nnx {fontspec} }
-\cs_new:Npn \fontspec_info:nxx { \msg_info:nnxx {fontspec} }
-\cs_new:Npn \fontspec_trace:n { \msg_trace:nn {fontspec} }
+\cs_new:Npn \__fontspec_error:n { \msg_error:nn {fontspec} }
+\cs_new:Npn \__fontspec_error:nx { \msg_error:nnx {fontspec} }
+\cs_new:Npn \__fontspec_warning:n { \msg_warning:nn {fontspec} }
+\cs_new:Npn \__fontspec_warning:nx { \msg_warning:nnx {fontspec} }
+\cs_new:Npn \__fontspec_warning:nxx { \msg_warning:nnxx {fontspec} }
+\cs_new:Npn \__fontspec_info:n { \msg_info:nn {fontspec} }
+\cs_new:Npn \__fontspec_info:nx { \msg_info:nnx {fontspec} }
+\cs_new:Npn \__fontspec_info:nxx { \msg_info:nnxx {fontspec} }
+\cs_new:Npn \__fontspec_trace:n { \msg_trace:nn {fontspec} }
\msg_new:nnn {fontspec} {no-size-info}
{
Size~ information~ must~ be~ supplied.\\
@@ -164,13 +164,13 @@
\msg_new:nnn {fontspec} {icu-feature-not-exist}
{
'\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
- for~ ICU~ font~ '\l_fontspec_fontname_tl'
+ for~ OpenType~ font~ '\l_fontspec_fontname_tl'
}
\msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
{
OpenType~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
for~ font~ '\l_fontspec_fontname_tl'~
- with~ script~ '\l_fontspec_script_name_tl'~ and~ language~ '\l_fontspec_lang_name_tl'.
+ with~ script~ '\l__fontspec_script_name_tl'~ and~ language~ '\l__fontspec_lang_name_tl'.
}
\msg_new:nnn {fontspec} {no-opticals}
{
@@ -180,7 +180,7 @@
{
Language~ '#1'~ not~ available~
for~ font~ '\l_fontspec_fontname_tl'~
- with~ script~ '\l_fontspec_script_name_tl'.\\
+ with~ script~ '\l__fontspec_script_name_tl'.\\
'Default'~ language~ used~ instead.
}
\msg_new:nnn {fontspec} {only-xetex-feature}
@@ -212,7 +212,7 @@
\msg_new:nnn {fontspec} {defining-font}
{
Font~ family~'\l_fontspec_family_tl'~ created~ for~ font~ '#2'~
- with~ options~ [\g_fontspec_default_fontopts_tl #1].\\
+ with~ options~ [\l__fontspec_all_features_clist].\\
\\
This~ font~ family~ consists~ of~ the~ following~ shapes:
\l_fontspec_defined_shapes_tl
@@ -223,7 +223,7 @@
}
\msg_new:nnn {fontspec} {set-scale}
{
- \l_fontspec_fontname_tl\space scale ~=~ \l_fontspec_scale_tl.
+ \l_fontspec_fontname_tl\space scale ~=~ \l__fontspec_scale_tl.
}
\msg_new:nnn {fontspec} {setup-math}
{
@@ -252,11 +252,11 @@
*~ an~ eight-digit~ hex~ colour~ RRGGBBTT~ with~ opacity
}
\DeclareOption{cm-default}
- { \fontspec_warning:n {cm-default-obsolete} }
-\DeclareOption{math}{\bool_set_true:N \g_fontspec_math_bool}
-\DeclareOption{no-math}{\bool_set_false:N \g_fontspec_math_bool}
-\DeclareOption{config}{\bool_set_true:N \g_fontspec_cfg_bool}
-\DeclareOption{no-config}{\bool_set_false:N \g_fontspec_cfg_bool}
+ { \__fontspec_warning:n {cm-default-obsolete} }
+\DeclareOption{math}{\bool_set_true:N \g__fontspec_math_bool}
+\DeclareOption{no-math}{\bool_set_false:N \g__fontspec_math_bool}
+\DeclareOption{config}{\bool_set_true:N \g__fontspec_cfg_bool}
+\DeclareOption{no-config}{\bool_set_false:N \g__fontspec_cfg_bool}
\DeclareOption{quiet}
{
\msg_redirect_module:nnn { fontspec } { warning } { info }
@@ -273,7 +273,7 @@
\luatex_if_engine:T { \RequirePackage{fontspec-luatex} \endinput }
\xetex_if_engine:T { \RequirePackage{fontspec-xetex} \endinput }
%%
-%% Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+%% Copyright 2004--2014 Will Robertson <wspr81@gmail.com>
%% Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,