summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/README5
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdfbin141998 -> 143833 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec.pdfbin2727242 -> 2727211 bytes
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec.dtx21
-rw-r--r--Master/texmf-dist/source/latex/fontspec/testsuite/F001a.ltx6
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty17
7 files changed, 26 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README
index d0bc7a2e4c1..d9d05c09bc7 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README
+++ b/Master/texmf-dist/doc/latex/fontspec/README
@@ -145,6 +145,11 @@ gladly accepted!
Change history
--------------
+- v2.1b (2010/09/29)
+
+ * Fix for bug introduced in the last release:
+ small caps weren't being automatically selected correctly
+
- v2.1a (2010/09/27)
* Fix for colours bug introduced in the last update
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
index 014448e5c43..5407fda0c1a 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index 6ac22a36eb8..f6c5b2d561f 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index 471fd81cdf9..068ceb64f38 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -62,7 +62,7 @@ This work consists of this file fontspec.dtx
%<fontspec>\ProvidesPackage{fontspec}
%<patches>\ProvidesPackage{fontspec-patches}
%<*fontspec|patches>
- [2010/09/27 v2.1a Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/09/29 v2.1b Advanced font selection for XeLaTeX/LuaLaTeX]
%</fontspec|patches>
%
%<*driver>
@@ -3661,7 +3661,8 @@ This work consists of this file fontspec.dtx
\tl_gset:cx {zf@family@fontname\zf@family} {#2}
\tl_gset:cx {zf@family@options\zf@family} {\g_fontspec_default_fontopts_tl #1}
\tl_gset:cx {zf@family@fontdef\zf@family} {
- \fontspec_fullname:n {\l_fontspec_fontname_tl} : \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist
+ \fontspec_fullname:n {\l_fontspec_fontname_tl} :
+ \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist
}
\tl_gset:cV {g_fontspec_script_num_(\zf@family)_tl} \l_fontspec_script_int
\tl_gset:cV {g_fontspec_lang_num_(\zf@family)_tl} \l_fontspec_language_int
@@ -3913,7 +3914,7 @@ This work consists of this file fontspec.dtx
<-> \l_fontspec_scale_tl
\fontspec_fontwrap:n {
\fontspec_fullname:n {\l_fontspec_fontname_tl} :
- \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist #1
+ \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist #1
}
}
}
@@ -3938,7 +3939,7 @@ This work consists of this file fontspec.dtx
<\l_fontspec_size_tl> \l_fontspec_scale_tl
\fontspec_fontwrap:n {
\fontspec_fullname:n { \l_fontspec_sizedfont_tl }
- : \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist #1
+ : \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist #1
}
}
@@ -3970,11 +3971,11 @@ This work consists of this file fontspec.dtx
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\l_fontspec_pre_feat_tl}
+% \begin{macro}{\l_fontspec_pre_feat_sclist}
% These are the features always applied to a font selection before other
% features.
% \begin{macrocode}
-\xetex_or_luatex:nnn { \tl_set:Nn \l_fontspec_pre_feat_tl }
+\xetex_or_luatex:nnn { \tl_set:Nn \l_fontspec_pre_feat_sclist }
{
\ifzf@icu
\tl_if_empty:NF \l_fontspec_script_tl
@@ -4134,16 +4135,12 @@ This work consists of this file fontspec.dtx
%
% \begin{macro}{\sclist_put_right:Nn}
% I'm hardly going to write an `sclist' module but a couple of functions are
-% necessary.
+% useful.
% \begin{macrocode}
\cs_set_eq:NN \sclist_new:N \tl_new:N
\cs_set_eq:NN \sclist_clear:N \tl_clear:N
\cs_new:Npn \sclist_gput_right:Nn #1#2 {
- \tl_if_empty:NTF #1 {
- \tl_gset:Nn #1 {#2}
- }{
- \tl_gput_right:Nn #1 {;#2}
- }
+ \tl_gput_right:Nn #1 {#2;}
}
\cs_generate_variant:Nn \sclist_gput_right:Nn {Nx}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/testsuite/F001a.ltx b/Master/texmf-dist/source/latex/fontspec/testsuite/F001a.ltx
index 538604c1e0b..7787e9ab41d 100644
--- a/Master/texmf-dist/source/latex/fontspec/testsuite/F001a.ltx
+++ b/Master/texmf-dist/source/latex/fontspec/testsuite/F001a.ltx
@@ -1,7 +1,9 @@
\documentclass{testsuite}
\usepackage{fontspec}
-\setmainfont{TeX Gyre Pagella}
+\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
\begin{document}
-Hello, moon!
+Hello, moon!\par
+\textsc{small caps}\par
+`--Punctuation---'
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index c62437b3a26..3a3e4751e28 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
@@ -14,7 +14,7 @@
%%
%%
\ProvidesPackage{fontspec-patches}
- [2010/09/27 v2.1a Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/09/29 v2.1b Advanced font selection for XeLaTeX/LuaLaTeX]
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index 7a1e55d7530..776a3d449da 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -14,7 +14,7 @@
%%
%%
\ProvidesPackage{fontspec}
- [2010/09/27 v2.1a Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/09/29 v2.1b Advanced font selection for XeLaTeX/LuaLaTeX]
\RequirePackage{expl3,xparse}
@@ -706,7 +706,8 @@
\tl_gset:cx {zf@family@fontname\zf@family} {#2}
\tl_gset:cx {zf@family@options\zf@family} {\g_fontspec_default_fontopts_tl #1}
\tl_gset:cx {zf@family@fontdef\zf@family} {
- \fontspec_fullname:n {\l_fontspec_fontname_tl} : \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist
+ \fontspec_fullname:n {\l_fontspec_fontname_tl} :
+ \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist
}
\tl_gset:cV {g_fontspec_script_num_(\zf@family)_tl} \l_fontspec_script_int
\tl_gset:cV {g_fontspec_lang_num_(\zf@family)_tl} \l_fontspec_language_int
@@ -843,7 +844,7 @@
<-> \l_fontspec_scale_tl
\fontspec_fontwrap:n {
\fontspec_fullname:n {\l_fontspec_fontname_tl} :
- \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist #1
+ \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist #1
}
}
}
@@ -862,7 +863,7 @@
<\l_fontspec_size_tl> \l_fontspec_scale_tl
\fontspec_fontwrap:n {
\fontspec_fullname:n { \l_fontspec_sizedfont_tl }
- : \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist #1
+ : \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist #1
}
}
@@ -881,7 +882,7 @@
}
}
}
-\xetex_or_luatex:nnn { \tl_set:Nn \l_fontspec_pre_feat_tl }
+\xetex_or_luatex:nnn { \tl_set:Nn \l_fontspec_pre_feat_sclist }
{
\ifzf@icu
\tl_if_empty:NF \l_fontspec_script_tl
@@ -986,11 +987,7 @@
\cs_set_eq:NN \sclist_new:N \tl_new:N
\cs_set_eq:NN \sclist_clear:N \tl_clear:N
\cs_new:Npn \sclist_gput_right:Nn #1#2 {
- \tl_if_empty:NTF #1 {
- \tl_gset:Nn #1 {#2}
- }{
- \tl_gput_right:Nn #1 {;#2}
- }
+ \tl_gput_right:Nn #1 {#2;}
}
\cs_generate_variant:Nn \sclist_gput_right:Nn {Nx}
\cs_new:Nn \fontspec_update_featstr:n {