summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-12 21:29:30 +0000
committerKarl Berry <karl@freefriends.org>2010-09-12 21:29:30 +0000
commit195fd3affcd7fcf42113f1b53ae0211908d64605 (patch)
tree6b34f08c6bbf88489ee68f89a13faf5b22e4180a /Master/texmf-dist/tex
parent0a567d7b796a35f4bed70801ff3269d1dd0fc824 (diff)
fontspec update
git-svn-id: svn://tug.org/texlive/trunk@19681 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty48
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty2
2 files changed, 27 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index 4a52efff3e4..0b3bac075ee 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/07/14 v2.0b Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/08/01 v2.0c Advanced font selection for XeLaTeX/LuaLaTeX]
@@ -35,23 +35,24 @@
\hyphenchar\font
\fi}{}{}}
\def\xlx@defaulthyphenchar{`\-}
-\def\xxt@visiblespace{
- \iffontchar\font"2423
- \expandafter\textvisiblespace
- \else
- \expandafter\xxt@visiblespace@fallback
- \fi
+\cs_new:Npn \fontspec_visible_space: {
+ \fontspec_glyph_if_exist:NnTF \font {"2423}
+ {\char"2423\relax}
+ {\fontspec_visible_space_fallback:}
}
-\def\xxt@visiblespace@fallback{
+\cs_new:Npn \fontspec_visible_space_fallback: {
{
\usefont{EU1}{lmtt}{\f@series}{\f@shape}
\textvisiblespace
}
}
-\begingroup
- \catcode`\~=\active
- \gdef\xxt@vprintspaces{\catcode`\~\active\let \xxt@visiblespace}
-\endgroup
+\group_begin:
+\char_make_active:n{"20}%
+\cs_gset:Npn\fontspec_print_visible_spaces:{%
+\char_make_active:n{"20}%
+\cs_set_eq:NN^^20\fontspec_visible_space:%
+}%
+\group_end:
\def\verb{
\relax\ifmmode\hbox\else\leavevmode\null\fi
\bgroup
@@ -59,7 +60,7 @@
\verbatim@font\@noligs
\@ifstar\@@sverb\@verb
}
-\def\@@sverb{\xxt@vprintspaces\@sverb}
+\def\@@sverb{\fontspec_print_visible_spaces:\@sverb}
\AtBeginDocument{
\fontspec_patch_verbatim:
\fontspec_patch_moreverb:
@@ -68,31 +69,34 @@
}
\cs_set:Npn \fontspec_patch_verbatim: {
\@ifpackageloaded{verbatim}{
- \@namedef{verbatim*}{
- \begingroup\@verbatim\xxt@vprintspaces\verbatim@start
+ \cs_set:cpn {verbatim*} {
+ \begingroup \@verbatim \fontspec_print_visible_spaces: \verbatim@start
}
}{
- \@namedef{verbatim*}{\@verbatim\xxt@vprintspaces\@sxverbatim}
+ \cs_set:cpn {verbatim*} {
+ \@verbatim \fontspec_print_visible_spaces: \@sxverbatim
+ }
}
}
\cs_set:Npn \fontspec_patch_moreverb: {
\@ifpackageloaded{moreverb}{
- \@namedef{listingcont*}{
- \def\verbatim@processline{
+ \cs_set:cpn {listingcont*} {
+ \cs_set:Npn \verbatim@processline {
\thelisting@line \global\advance\listing@line\c_one
\the\verbatim@line\par
}
- \@verbatim\xxt@vprintspaces\verbatim@start
+ \@verbatim \fontspec_print_visible_spaces: \verbatim@start
}
- }{}}
+ }{}
+}
\cs_set:Npn \fontspec_patch_fancyvrb: {
\@ifpackageloaded{fancyvrb}{
- \let\FancyVerbSpace\xxt@visiblespace
+ \cs_set_eq:NN \FancyVerbSpace \fontspec_visible_space:
}{}
}
\cs_set:Npn \fontspec_patch_listings: {
\@ifpackageloaded{listings}{
- \let\lst@visiblespace\xxt@visiblespace
+ \cs_set_eq:NN \lst@visiblespace \fontspec_visible_space:
}{}
}
%%
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index d842d849224..a0c8c5684db 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/07/14 v2.0b Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/08/01 v2.0c Advanced font selection for XeLaTeX/LuaLaTeX]