diff options
| author | Karl Berry <karl@freefriends.org> | 2017-11-09 23:44:31 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-11-09 23:44:31 +0000 |
| commit | d58e09051eed105b7c4b93a513e0fd02ae2dfd4b (patch) | |
| tree | aa46d20a14160b1e582040da11625b63fb269bd8 /Master | |
| parent | 99faba785d6e66859a2b9ab1d49e7f3c0db491af (diff) | |
fontspec (9nov17)
git-svn-id: svn://tug.org/texlive/trunk@45732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
44 files changed, 569 insertions, 520 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md index 8870ac5b9b1..7a8a0760bcd 100644 --- a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md +++ b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md @@ -2,6 +2,14 @@ Change history ============== +- v2.6g (2017-11-09) + + * Bugfix for clash introduced with last version. When loading `babel` + before `fontspec` the following error arose: + + ! Control sequence \latinencoding already defined. + + - v2.6f (2017-11-05) * Fix loading of Graphite fonts and add a little documentation (a better interface is needed, though) diff --git a/Master/texmf-dist/doc/latex/fontspec/README.md b/Master/texmf-dist/doc/latex/fontspec/README.md index 77e00a69132..cd01b539d8b 100644 --- a/Master/texmf-dist/doc/latex/fontspec/README.md +++ b/Master/texmf-dist/doc/latex/fontspec/README.md @@ -81,17 +81,3 @@ local texmf tree. Depending how your TeX distribution is configured you may then need to update the filename database with `texhash`. - -License -------- - -Copyright 2004--2017 Will Robertson <will.robertson@latex-project.org> -Copyright 2009--2010 Khaled Hosny <khaledhosny@eglug.org> - -Distributable under the LaTeX Project Public License, -version 1.3c or higher (your choice). The latest version of -this license is at: http://www.latex-project.org/lppl.txt - -This work is "maintained" (as per LPPL maintenance status) -by Will Robertson. - diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx deleted file mode 100644 index 5b1e400de1b..00000000000 --- a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx +++ /dev/null @@ -1,44 +0,0 @@ -%%^^A%% fontspec-code.ltx -- part of FONTSPEC <wspr.io/fontspec> - -\documentclass[a4paper]{l3doc} -\usepackage{fontspec-doc-style} -\begin{document} - -\GetFileInfo{fontspec.dtx} -\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX} -\author{ - \textsc{Will Robertson} and \textsc{Khaled Hosny}\\ - \url{http://wspr.io/fontspec/} -} -\date{\filedate \qquad \fileversion} - -\maketitle -\tableofcontents -\newpage - -\def\DTX#1{\DocInput{#1}} -\FONTSPECDTX - -\clearpage -\PrintChanges - -\clearpage -\setcounter{IndexColumns}{2} -\PrintIndex - -\end{document} - -\endinput - -% /© -% ------------------------------------------------ -% The FONTSPEC package <wspr.io/fontspec> -% ------------------------------------------------ -% Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny -% ------------------------------------------------ -% This package is free software and may be redistributed and/or modified under -% the conditions of the LaTeX Project Public License, version 1.3c or higher -% (your choice): <http://www.latex-project.org/lppl/>. -% ------------------------------------------------ -% ©/ diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf Binary files differindex 529af944e11..fe889558f00 100644 --- a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf +++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx b/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx deleted file mode 100644 index c1eeeecdc9b..00000000000 --- a/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx +++ /dev/null @@ -1,47 +0,0 @@ -%%^^A%% fontspec.ltx -- part of FONTSPEC <wspr.io/fontspec> - -\ifdefined \XeTeXOTcountscripts \else \makeatletter - \@latex@error{^^J*** The fontspec documentation can only be typeset with `xelatex` ***\@gobble}\@ehc -\fi - -\documentclass[a4paper]{l3doc} -\usepackage{fontspec-doc-style} -\begin{document} - -\GetFileInfo{fontspec.dtx} -\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX} -\author{ - \textsc{Will Robertson} and \textsc{Khaled Hosny}\\ - \url{http://wspr.io/fontspec/} -} -\date{\filedate \qquad \fileversion} - -\maketitle -\tableofcontents -\newpage - -\include{fontspec-doc-intro} -\include{fontspec-doc-fontsel} -\include{fontspec-doc-featset} -\include{fontspec-doc-opentype} -\include{fontspec-doc-enc} -\include{fontspec-doc-luatex} -\include{fontspec-doc-xetex} -\include{fontspec-doc-api} - -\end{document} - -\endinput - -% /© -% ------------------------------------------------ -% The FONTSPEC package <wspr.io/fontspec> -% ------------------------------------------------ -% Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny -% ------------------------------------------------ -% This package is free software and may be redistributed and/or modified under -% the conditions of the LaTeX Project Public License, version 1.3c or higher -% (your choice): <http://www.latex-project.org/lppl/>. -% ------------------------------------------------ -% ©/ diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf Binary files differindex d9cbbffc32f..5e9584724d4 100644 --- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf +++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx index 13a92d193ad..c183656a66a 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -352,7 +352,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -364,7 +364,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx index a3225473b40..4d14d475219 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -21,7 +21,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -33,7 +33,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-load.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-load.dtx index 910d407c02e..d3cacc4c6b4 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-load.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-load.dtx @@ -1,36 +1,59 @@ %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> % -% \section{Loading} +% \section{The \texttt{fontspec.sty} loading file} % -% The \textsf{expl3} module is \texttt{fontspec}. +% Before we begin, for the rest of the package we use the \texttt{@@} \textsf{expl3} +% module syntax with module name `\texttt{fontspec}'. % \begin{macrocode} %<@@=fontspec> % \end{macrocode} +% The \texttt{fontspec.sty} file is simply set up to load the appropriate +% \texttt{fontspec-xetex.sty} or \texttt{fontspec-luatex.sty} file. +% This is performed by the following code. % -% Check engine and load specific modules. -% For Lua\TeX, load \pkg{luaotfload}. % \begin{macrocode} %<*load> +% \end{macrocode} +% +% \paragraph{\LuaLaTeX} +% \begin{macrocode} \sys_if_engine_luatex:T - { \RequirePackage{luaotfload} + { + \RequirePackage{luaotfload} \directlua{require("fontspec")} - \RequirePackageWithOptions{fontspec-luatex} \endinput } + \RequirePackageWithOptions{fontspec-luatex} + \endinput + } +% \end{macrocode} +% +% \paragraph{\XeLaTeX} +% \begin{macrocode} \sys_if_engine_xetex:T - { \RequirePackageWithOptions{fontspec-xetex} \endinput } + { + \RequirePackageWithOptions{fontspec-xetex} + \endinput + } % \end{macrocode} -% If not one of the above, error: +% +% \paragraph{Other} +% If not one of the above, error and exit. % \begin{macrocode} \msg_new:nnn {fontspec} {cannot-use-pdftex} - { - The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\ - You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ "xelatex"~ or~ "lualatex" instead~ of~ plain~ "latex"~ or~ "pdflatex". - } + { + The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\ + You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ + "xelatex"~ or~ "lualatex" instead~ of~ "latex"~ or~ "pdflatex". + } \msg_fatal:nn {fontspec} {cannot-use-pdftex} +% \end{macrocode} +% +% \paragraph{Closing} +% That's the end of the \texttt{fontspec.sty} file. +% \begin{macrocode} \endinput %</load> % \end{macrocode} - \endinput % /© @@ -38,7 +61,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code.ltx b/Master/texmf-dist/source/latex/fontspec/fontspec-code.ltx index 5b1e400de1b..bc47ad93627 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code.ltx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code.ltx @@ -1,22 +1,18 @@ %%^^A%% fontspec-code.ltx -- part of FONTSPEC <wspr.io/fontspec> +\ifdefined \XeTeXOTcountscripts \else \makeatletter + \@latex@error{^^J*** The fontspec documentation can only be typeset with `xelatex` ***\@gobble}\@ehc +\fi + \documentclass[a4paper]{l3doc} \usepackage{fontspec-doc-style} +\renewcommand\partname{File} \begin{document} - -\GetFileInfo{fontspec.dtx} -\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX} -\author{ - \textsc{Will Robertson} and \textsc{Khaled Hosny}\\ - \url{http://wspr.io/fontspec/} -} -\date{\filedate \qquad \fileversion} - \maketitle \tableofcontents \newpage -\def\DTX#1{\DocInput{#1}} +\def\DTX#1{\clearpage\part{#1}\DocInput{#1}} \FONTSPECDTX \clearpage @@ -35,7 +31,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex index ffbe56d67a9..eebd8f89670 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex @@ -319,7 +319,9 @@ OpenType language tag |#1|. % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex index 7df38578403..ad686e42731 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex @@ -205,7 +205,9 @@ the process of defining Unicode font range encodings: % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex index f37f982ca93..f3e36ffbbd2 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex @@ -605,7 +605,9 @@ Also see the OpenType \opt{Uppercase} option of the \feat{Letters} feature (\vre % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex index 7f374337a05..ea07c78b132 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex @@ -570,7 +570,9 @@ if it were a `naked' control sequence; \eg, `|M. \fontspec{...} N|' and % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex index 6bc3fc8bd12..504d3b343b7 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex @@ -241,7 +241,9 @@ An example for setting up a font family for use with \cs{strong} is discussed in % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex index 140e4d9af20..b08bd3f8bf6 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex @@ -47,7 +47,9 @@ Please refer to the \LuaTeX/\pkg{luaotfload} documentation for more details. % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex index 76af34f2185..2c8baef847c 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex @@ -1447,7 +1447,9 @@ Thanks to \name{Jonathan Kew}, \name{Yves Codet} and % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex index e0ae035e4e0..30d99ecc6a0 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex @@ -369,7 +369,9 @@ options: \opt{Off}, % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx index 7484e077638..3a0f4142814 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -12,8 +12,8 @@ % \begin{macrocode} \providecommand\UnicodeFontFile[2]{"[#1]:#2"} \providecommand\UnicodeFontName[2]{"#1:#2"} -%<xetexx>\providecommand\UnicodeFontTeXLigatures{mapping=tex-text;} -%<luatex>\providecommand\UnicodeFontTeXLigatures{+tlig;} +%<XE>\providecommand\UnicodeFontTeXLigatures{mapping=tex-text;} +%<LU>\providecommand\UnicodeFontTeXLigatures{+tlig;} % \end{macrocode} % % \begin{macrocode} @@ -150,7 +150,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -162,7 +162,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx index b0d846ef48d..1a7f5d6b70e 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx @@ -1,16 +1,16 @@ %%^^A%% fontspec-feat-aat.dtx -- part of FONTSPEC <wspr.io/fontspec> -% \subsection{AAT feature definitions} +% \section{AAT feature definitions} % % These are only defined for \XeTeX. % % \iffalse % \begin{macrocode} -%<*fontspec&xetexx> +%<*fontspec&XE> % \end{macrocode} % \fi -% \subsubsection{Ligatures} +% \subsection{Ligatures} % \begin{macrocode} \@@_define_aat_feature_group:n {Ligatures} \@@_define_aat_feature:nnnn {Ligatures} {Required} {1} {0} @@ -45,7 +45,7 @@ } % \end{macrocode} % -% \subsubsection{Letters} +% \subsection{Letters} % \begin{macrocode} \@@_define_aat_feature_group:n {Letters} \@@_define_aat_feature:nnnn {Letters} {Normal} {3} {0} @@ -55,7 +55,7 @@ \@@_define_aat_feature:nnnn {Letters} {InitialCaps} {3} {4} % \end{macrocode} % -% \subsubsection{Numbers} +% \subsection{Numbers} % % These were originally separated into \feat{NumberCase} and % \feat{NumberSpacing} following \AAT, but it makes more sense to @@ -75,7 +75,7 @@ \@@_define_aat_feature:nnnn {Numbers} {NoSlashedZero} {14} {4} % \end{macrocode} % -% \subsubsection{Contextuals} +% \subsection{Contextuals} % \begin{macrocode} \@@_define_aat_feature_group:n {Contextuals} \@@_define_aat_feature:nnnn {Contextuals} {WordInitial} {8} {0} @@ -90,7 +90,7 @@ \@@_define_aat_feature:nnnn {Contextuals} {NoInner} {8} {9} % \end{macrocode} % -% \subsubsection{Diacritics} +% \subsection{Diacritics} % \begin{macrocode} \@@_define_aat_feature_group:n {Diacritics} \@@_define_aat_feature:nnnn {Diacritics} {Show} {9} {0} @@ -99,7 +99,7 @@ % \end{macrocode} % % -% \subsubsection{Vertical position} +% \subsection{Vertical position} % \begin{macrocode} \@@_define_aat_feature_group:n {VerticalPosition} \@@_define_aat_feature:nnnn {VerticalPosition} {Normal} {10} {0} @@ -108,7 +108,7 @@ \@@_define_aat_feature:nnnn {VerticalPosition} {Ordinal} {10} {3} % \end{macrocode} % -% \subsubsection{Fractions} +% \subsection{Fractions} % \begin{macrocode} \@@_define_aat_feature_group:n {Fractions} \@@_define_aat_feature:nnnn {Fractions} {On} {11} {1} @@ -116,7 +116,7 @@ \@@_define_aat_feature:nnnn {Fractions} {Diagonal} {11} {2} % \end{macrocode} % -% \subsubsection{Alternate} +% \subsection{Alternate} % \begin{macrocode} \@@_define_aat_feature_group:n { Alternate } \keys_define:nn {fontspec-aat} @@ -133,7 +133,7 @@ % \end{macrocode} % % -% \subsubsection{Variant / StylisticSet} +% \subsection{Variant / StylisticSet} % \begin{macrocode} \@@_define_aat_feature_group:n {Variant} \keys_define:nn {fontspec-aat} @@ -164,7 +164,7 @@ % \end{macrocode} % % -% \subsubsection{Style} +% \subsection{Style} % \begin{macrocode} \@@_define_aat_feature_group:n {Style} \@@_define_aat_feature:nnnn {Style} {Italic} {32} {2} @@ -175,7 +175,7 @@ \@@_define_aat_feature:nnnn {Style} {TallCaps} {19} {5} % \end{macrocode} % -% \subsubsection{CJK shape} +% \subsection{CJK shape} % \begin{macrocode} \@@_define_aat_feature_group:n {CJKShape} \@@_define_aat_feature:nnnn {CJKShape} {Traditional} {20} {0} @@ -187,7 +187,7 @@ \@@_define_aat_feature:nnnn {CJKShape} {NLC} {20} {13} % \end{macrocode} % -% \subsubsection{Character width} +% \subsection{Character width} % \begin{macrocode} \@@_define_aat_feature_group:n {CharacterWidth} \@@_define_aat_feature:nnnn {CharacterWidth} {Proportional} {22} {0} @@ -200,7 +200,7 @@ \@@_define_aat_feature:nnnn {CharacterWidth} {Default} {22} {7} % \end{macrocode} % -% \subsubsection{Annotation} +% \subsection{Annotation} % \begin{macrocode} \@@_define_aat_feature_group:n {Annotation} \@@_define_aat_feature:nnnn {Annotation} {Off} {24} {0} @@ -219,7 +219,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&xetexx> +%</fontspec&XE> % \end{macrocode} % \fi @@ -232,7 +232,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx index b351d06c295..cf0a430b0fa 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx @@ -1,10 +1,10 @@ %%^^A%% fontspec-feat-opentype.dtx -- part of FONTSPEC <wspr.io/fontspec> -% \subsection{OpenType feature definitions} +% \section{OpenType feature definitions} % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -17,16 +17,16 @@ \@@_feat_prop_add:nn {ssNN} { StylisticSet\,=\,$N$ } % \end{macrocode} % -% \subsection{Regular key=val / tag definitions} +% \section{Regular key=val / tag definitions} % -% \subsubsection{Ligatures} +% \subsection{Ligatures} % \begin{macrocode} \@@_define_opentype_feature_group:n {Ligatures} \@@_define_opentype_feature:nnnnn {Ligatures} {ResetAll} {} {} { +dlig,-dlig,+rlig,-rlig,+liga,-liga,+dlig,-dlig,+clig,-clig,+hlig,-hlig, -%<xetexx> mapping = tex-text -%<luatex> +tlig,-tlig +%<XE> mapping = tex-text +%<LU> +tlig,-tlig } % \end{macrocode} % @@ -40,17 +40,17 @@ % \end{macrocode} % Emulate CM extra ligatures. % \begin{macrocode} -%<*xetexx> +%<*XE> \keys_define:nn {fontspec-opentype} { Ligatures / TeX .code:n = { \tl_set:Nn \l_@@_mapping_tl {tex-text} }, Ligatures / TeXReset .code:n = { \tl_clear:N \l_@@_mapping_tl }, } -%</xetexx> -%<luatex>\@@_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { +tlig } {} +%</XE> +%<LU>\@@_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { +tlig } {} % \end{macrocode} % -% \subsubsection{Letters} +% \subsection{Letters} % \begin{macrocode} \@@_define_opentype_feature_group:n {Letters} \@@_define_opentype_feature:nnnnn {Letters} {ResetAll} {} {} @@ -70,7 +70,7 @@ \@@_define_opentype_onoffreset:nnnnn {Letters} {Random} {rand} {rand} {+unic} % \end{macrocode} % -% \subsubsection{Numbers} +% \subsection{Numbers} % \begin{macrocode} \@@_define_opentype_feature_group:n {Numbers} \@@_define_opentype_feature:nnnnn {Numbers} {ResetAll} {} {} @@ -102,10 +102,10 @@ % (AKA Arabic) numbers with Arabic (AKA Indic-Arabic). The same feature % maps to Farsi (Persian) numbers if font language is Farsi. % \begin{macrocode} -%<luatex> \@@_define_opentype_onoffreset:nnnnn {Numbers} {Arabic} {anum} {anum} {} +%<LU> \@@_define_opentype_onoffreset:nnnnn {Numbers} {Arabic} {anum} {anum} {} % \end{macrocode} % -% \subsubsection{Vertical position} +% \subsection{Vertical position} % \begin{macrocode} \@@_define_opentype_feature_group:n {VerticalPosition} \@@_define_opentype_feature:nnnnn {VerticalPosition} {ResetAll} {} {} @@ -128,7 +128,7 @@ \@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {ScientificInferior} {sinf} {sinf} {+sups,+subs,+ordn,+numr,+dnom} % \end{macrocode} % -% \subsubsection{Contextuals} +% \subsection{Contextuals} % \begin{macrocode} \@@_define_opentype_feature_group:n {Contextuals} \@@_define_opentype_feature:nnnnn {Contextuals} {ResetAll} {} {} @@ -151,7 +151,7 @@ \@@_define_opentype_onoffreset:nnnnn {Contextuals} {Inner} {medi} {medi} {} % \end{macrocode} % -% \subsubsection{Diacritics} +% \subsection{Diacritics} % \begin{macrocode} \@@_define_opentype_feature_group:n {Diacritics} \@@_define_opentype_feature:nnnnn {Diacritics} {ResetAll} {} {} @@ -170,7 +170,7 @@ \@@_define_opentype_onoffreset:nnnnn {Diacritics} {BelowBase} {blwm} {blwm} {} % \end{macrocode} % -% \subsubsection{Kerning} +% \subsection{Kerning} % \begin{macrocode} \@@_define_opentype_feature_group:n {Kerning} \@@_define_opentype_feature:nnnnn {Kerning} {ResetAll} {} {} @@ -184,7 +184,7 @@ \@@_define_opentype_feature:nnnnn {Kerning} {Reset} {} {} {+kern,-kern} % \end{macrocode} % -% \subsubsection{Fractions} +% \subsection{Fractions} % \begin{macrocode} \@@_define_opentype_feature_group:n {Fractions} \@@_define_opentype_feature:nnnnn {Fractions} {ResetAll} {} {} @@ -202,7 +202,7 @@ % \end{macrocode} % -% \subsubsection{Style} +% \subsection{Style} % \begin{macrocode} \@@_define_opentype_feature_group:n {Style} \@@_define_opentype_feature:nnnnn {Style} {ResetAll} {} {} @@ -235,7 +235,7 @@ \@@_define_opentype_feature:nnnnn {Style} {MathScriptScript} {ssty} {+ssty=1} {+ssty=0} % \end{macrocode} % -% \subsubsection{CJK shape} +% \subsection{CJK shape} % \begin{macrocode} \@@_define_opentype_feature_group:n {CJKShape} \@@_define_opentype_feature:nnnnn {CJKShape} {ResetAll} {} {} @@ -262,7 +262,7 @@ \@@_define_opentype_onoffreset:nnnnn {CJKShape} {NLC} {nlck} {nlck} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+expt} % \end{macrocode} % -% \subsubsection{Character width} +% \subsection{Character width} % \begin{macrocode} \@@_define_opentype_feature_group:n {CharacterWidth} \@@_define_opentype_feature:nnnnn {CharacterWidth} {ResetAll} {} {} @@ -287,7 +287,7 @@ \@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateHalf} {halt} {halt} {+pwid,+fwid,+hwid,+twid,+qwid,+palt} % \end{macrocode} % -% \subsubsection{Vertical} +% \subsection{Vertical} % According to spec |vkrn| must also activate |vpal| if available but for simplicity we don't do that here (yet?). % \begin{macrocode} \@@_define_opentype_feature_group:n {Vertical} @@ -304,16 +304,16 @@ % % % -% \subsection{OpenType features that need numbering} +% \section{OpenType features that need numbering} % -% \subsubsection{Alternate} +% \subsection{Alternate} % \begin{macrocode} \@@_define_opentype_feature_group:n {Alternate} \keys_define:nn {fontspec-opentype} { Alternate .default:n = {0} , -%<luatex> Alternate / Random .code:n = -%<luatex> { \@@_make_OT_feature:nnn {salt}{ +salt = random }{} } , +%<LU> Alternate / Random .code:n = +%<LU> { \@@_make_OT_feature:nnn {salt}{ +salt = random }{} } , Alternate / unknown .code:n = { \clist_map_inline:nn {#1} @@ -327,7 +327,7 @@ % \end{macrocode} % % -% \subsubsection{Variant / StylisticSet} +% \subsection{Variant / StylisticSet} % \begin{macrocode} \@@_define_opentype_feature_group:n {Variant} \keys_define:nn {fontspec-opentype} @@ -347,7 +347,7 @@ \aliasfontfeature{Variant}{StylisticSet} % \end{macrocode} % -% \subsubsection{CharacterVariant} +% \subsection{CharacterVariant} % \begin{macrocode} \@@_define_opentype_feature_group:n {CharacterVariant} \use:x @@ -374,7 +374,7 @@ % Possibilities: \verb|a:0:\q_nil| or \verb|a:b:0:\q_nil|. % % -% \subsubsection{Annotation} +% \subsection{Annotation} % \begin{macrocode} \@@_define_opentype_feature_group:n {Annotation} \keys_define:nn {fontspec-opentype} @@ -387,7 +387,7 @@ } % \end{macrocode} % -% \subsubsection{Ornament} +% \subsection{Ornament} % % \begin{macrocode} \@@_define_opentype_feature_group:n {Ornament} @@ -402,10 +402,10 @@ % \end{macrocode} % % -% \subsection{Script and Language} +% \section{Script and Language} % % -% \subsubsection{Script} +% \subsection{Script} % % \begin{macrocode} \keys_define:nn { fontspec-opentype } { Script .choice: } @@ -448,7 +448,7 @@ % \end{macrocode} % % -% \subsubsection{Language} +% \subsection{Language} % % \begin{macrocode} \keys_define:nn { fontspec-opentype } { Language .choice: } @@ -508,7 +508,7 @@ } % \end{macrocode} % -% \subsection{Backwards compatibility} +% \section{Backwards compatibility} % Backwards compatibility: % \begin{macrocode} \cs_new:Nn \@@_ot_compat:nn @@ -536,7 +536,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -548,7 +548,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx index 69760d20512..346a0b008a8 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -83,7 +83,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -94,7 +94,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx index 565db2faec4..73c166f234e 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&xetexx> +%<*fontspec&XE> % \end{macrocode} % \fi % @@ -100,7 +100,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&xetexx> +%</fontspec&XE> % \end{macrocode} % \fi @@ -112,7 +112,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-interfaces.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-interfaces.dtx index 25eb3fb1a53..b90ac388bdc 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-interfaces.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-interfaces.dtx @@ -9,7 +9,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -195,7 +195,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -207,7 +207,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx index a56503dced1..7a78ac73b7c 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -88,7 +88,7 @@ \cs_new:Nn \@@_sanitise_fontname:Nn { \tl_set:Nx #1 {#2} -%<luatex> \tl_remove_all:Nn #1 {~} +%<LU> \tl_remove_all:Nn #1 {~} \clist_map_inline:Nn \l_@@_extensions_clist { \tl_if_in:NnT #1 {##1} @@ -251,17 +251,17 @@ % \darg{Font features} % We check if \meta{Font features} are empty and if so don't add in the separator colon. % \begin{macrocode} -\cs_set:Nn \@@_construct_font_call:nnnnnn +\cs_new:Nn \@@_construct_font_call:nnnnnn { -%<xetexx> " \@@_fontname_wrap:n { #1 #2 #3 } -%<luatex> " \@@_fontname_wrap:n { #1 #2 } #3 +%<XE> " \@@_fontname_wrap:n { #1 #2 #3 } +%<LU> " \@@_fontname_wrap:n { #1 #2 } #3 #4 #5 \str_if_eq_x:nnF {#6}{} {:#6} " } % \end{macrocode} % In practice, we don't use the six-argument version, since most arguments are constructed on-the-fly: % \begin{macrocode} -\cs_set:Nn \@@_construct_font_call:nn +\cs_new:Nn \@@_construct_font_call:nn { \@@_construct_font_call:nnnnnn {#1} @@ -337,14 +337,14 @@ % Do not set the colour if not explicitly spec'd else \verb|\color| (using % specials) will not work. % \begin{macrocode} -\cs_set:Nn \@@_get_features:Nn +\cs_new:Nn \@@_get_features:Nn { %<debug> \typeout{:: @@_get_features:Nn \exp_not:N #1 { \exp_not:n {#2} } } \@@_init_fontface: \@@_keys_set_known:nxN {fontspec-renderer} {\l_@@_fontfeat_clist,#2} \l_@@_keys_leftover_clist \@@_keys_set_known:nxN {fontspec} {\l_@@_keys_leftover_clist} \l_@@_keys_leftover_clist -%<*xetexx> +%<*XE> \bool_if:NTF \l_@@_ot_bool { %<debug> \typeout{::: Setting~ keys~ for~ OpenType~ font~ features:~"\l_@@_keys_leftover_clist"} @@ -357,11 +357,11 @@ \bool_if:nT { \l_@@_atsui_bool || \l_@@_graphite_bool } { \keys_set:nV {fontspec-aat} \l_@@_keys_leftover_clist } } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> %<debug> \typeout{::: Setting~ keys~ for~ OpenType~ font~ features:~"\l_@@_keys_leftover_clist"} \keys_set:nV {fontspec-opentype} \l_@@_keys_leftover_clist -%</luatex> +%</LU> \tl_if_empty:NF \l_@@_mapping_tl { \@@_update_featstr:n { mapping = \l_@@_mapping_tl } } @@ -522,11 +522,11 @@ % replaced by the font name. This lets us define supplementary fonts in full % (``\texttt{Baskerville Semibold}'') or in abbreviation (``\texttt{* Semibold}''). % \begin{macrocode} -\cs_set:Nn \fontspec_complete_fontname:Nn +\cs_new:Nn \fontspec_complete_fontname:Nn { \tl_set:Nx #1 {#2} \tl_replace_all:Nnx #1 {*} {\l_@@_basename_tl} -%<luatex> \tl_remove_all:Nn #1 {~} +%<LU> \tl_remove_all:Nn #1 {~} } % \end{macrocode} % \end{macro} @@ -569,7 +569,7 @@ \cs_new:Nn \@@_set_font_type:N { %<debug> \typeout{:: @@_set_font_type:} -%<*xetexx> +%<*XE> \bool_set_false:N \l_@@_tfm_bool \bool_set_false:N \l_@@_atsui_bool \bool_set_false:N \l_@@_ot_bool @@ -590,7 +590,7 @@ \bool_set_true:N \l_@@_graphite_bool \tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/GR} } \fi -%</xetexx> +%</XE> % \end{macrocode} % If automatic, the \cmd{\l_fontspec_renderer_tl} token list will still be % empty (other suffices that could be added will be later in the feature @@ -599,9 +599,9 @@ % % LuaTeX only supports one: % \begin{macrocode} -%<*luatex> +%<*LU> \bool_set_true:N \l_@@_ot_bool -%</luatex> +%</LU> } % \end{macrocode} % \end{macro} @@ -889,7 +889,7 @@ % features. % \begin{macrocode} \tl_set:Nn \l_@@_pre_feat_sclist -%<*xetexx> +%<*XE> { \bool_if:NT \l_@@_ot_bool { @@ -900,8 +900,8 @@ } } } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> { mode = \l_fontspec_mode_tl ; \tl_if_empty:NF \l_fontspec_script_tl @@ -910,7 +910,7 @@ language = \l_fontspec_lang_tl ; } } -%</luatex> +%</LU> % \end{macrocode} % \end{macro} % @@ -919,13 +919,13 @@ % \label{mac:makesmallcaps} % This macro checks if the font contains small caps. % \begin{macrocode} -%<luatex>\cs_set:Nn \@@_make_smallcaps:TF -%<xetexx>\cs_set:Nn \@@_make_ot_smallcaps:TF +%<LU>\cs_new:Nn \@@_make_smallcaps:TF +%<XE>\cs_new:Nn \@@_make_ot_smallcaps:TF { \@@_check_ot_feat:NnTF \l_fontspec_font {smcp} {#1} {#2} } -%<*xetexx> -\cs_set:Nn \@@_make_smallcaps:TF +%<*XE> +\cs_new:Nn \@@_make_smallcaps:TF { \bool_if:NTF \l_@@_ot_bool { \@@_make_ot_smallcaps:TF {#1} {#2} } @@ -934,7 +934,7 @@ { \@@_make_AAT_feature_string:NnnTF \l_fontspec_font {3}{3} {#1} {#2} } } } -%</xetexx> +%</XE> % \end{macrocode} % \end{macro} % @@ -992,13 +992,13 @@ \tl_clear:N \g_@@_curr_series_tl \tl_gset_eq:NN \l_@@_nfss_enc_tl \g_fontspec_encoding_tl -%<*luatex> +%<*LU> \tl_set:Nn \l_fontspec_mode_tl {node} \int_set:Nn \luatex_prehyphenchar:D { `\- } % fixme \int_zero:N \luatex_posthyphenchar:D % fixme \int_zero:N \luatex_preexhyphenchar:D % fixme \int_zero:N \luatex_postexhyphenchar:D % fixme -%</luatex> +%</LU> } % \end{macrocode} % \end{macro} @@ -1036,7 +1036,7 @@ % % For backwards compatibility this code also strips a leading |+| or |-|. % \begin{macrocode} -\cs_set:Nn \@@_iv_str_to_num:Nn +\cs_new:Nn \@@_iv_str_to_num:Nn { \@@_strip_leading_sign:Nw #1#2 \q_nil } @@ -1063,7 +1063,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -1075,7 +1075,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx index 900f8fd7840..1169f2458f0 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx @@ -7,7 +7,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -65,9 +65,9 @@ \bool_set_true:N \l_@@_external_bool \tl_set:Nn \l_@@_font_path_tl {#1} \@@_font_is_file: -%<*xetexx> +%<*XE> \keys_set:nn {fontspec-renderer} {Renderer=OpenType} -%</xetexx> +%</XE> } \aliasfontfeature{Path}{ExternalLocation} \@@_keys_define_code:nnn {fontspec} {Path} {} @@ -105,28 +105,28 @@ {AAT,ICU,OpenType,Graphite,Full,Basic} { \int_compare:nTF {\l_keys_choice_int <= 4} { -%<*xetexx> +%<*XE> \tl_set:Nx \l_fontspec_renderer_tl { \int_case:nn \l_keys_choice_int { 1 {/AAT} 2 {/OT} 3 {/OT} 4 {/GR} } } \tl_gset:Nx \g_@@_single_feat_tl { \l_fontspec_renderer_tl } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> \@@_warning:nx {only-xetex-feature} {Renderer=AAT/OpenType/Graphite} -%</luatex> +%</LU> } { -%<*xetexx> +%<*XE> \@@_warning:nx {only-luatex-feature} {Renderer=Full/Basic} -%</xetexx> -%<*luatex> +%</XE> +%<*LU> \tl_set:Nx \l_fontspec_mode_tl { \int_case:nn \l_keys_choice_int { 5 {node} 6 {base} } } \tl_gset:Nx \g_@@_single_feat_tl { mode=\l_fontspec_mode_tl } -%</luatex> +%</LU> } } } @@ -137,7 +137,7 @@ % \begin{macrocode} \@@_keys_define_code:nnn {fontspec-preparse} {Script} { -%<xetexx> \keys_set:nn {fontspec-renderer} {Renderer=OpenType} +%<XE> \keys_set:nn {fontspec-renderer} {Renderer=OpenType} \tl_set:Nn \l_@@_script_name_tl {#1} } % \end{macrocode} @@ -145,7 +145,7 @@ % \begin{macrocode} \@@_keys_define_code:nnn {fontspec-preparse} {Language} { -%<xetexx> \keys_set:nn {fontspec-renderer} {Renderer=OpenType} +%<XE> \keys_set:nn {fontspec-renderer} {Renderer=OpenType} \tl_set:Nn \l_@@_lang_name_tl {#1} } % \end{macrocode} @@ -156,13 +156,13 @@ { \str_if_eq_x:nnF { \str_lower_case:f {\l_@@_extension_tl} } {.ttc} { \@@_warning:n {font-index-needs-ttc} } -%<xetexx> \tl_set:Nn \l_@@_ttc_index_tl {:#1} -%<luatex> \tl_set:Nn \l_@@_ttc_index_tl {(#1)} +%<XE> \tl_set:Nn \l_@@_ttc_index_tl {:#1} +%<LU> \tl_set:Nn \l_@@_ttc_index_tl {(#1)} } \@@_keys_define_code:nnn {fontspec} {FontIndex} { -%<xetexx> \tl_set:Nn \l_@@_ttc_index_tl {:#1} -%<luatex> \tl_set:Nn \l_@@_ttc_index_tl {(#1)} +%<XE> \tl_set:Nn \l_@@_ttc_index_tl {:#1} +%<LU> \tl_set:Nn \l_@@_ttc_index_tl {(#1)} } % \end{macrocode} % @@ -664,7 +664,7 @@ % % \paragraph{Mapping} % \begin{macrocode} -%<*xetexx> +%<*XE> \@@_keys_define_code:nnn {fontspec-aat} {Mapping} { \tl_set:Nn \l_@@_mapping_tl { #1 } @@ -673,8 +673,8 @@ { \tl_set:Nn \l_@@_mapping_tl { #1 } } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> \@@_keys_define_code:nnn {fontspec-opentype} {Mapping} { \str_if_eq:nnTF {#1} {tex-text} @@ -685,7 +685,7 @@ } { \@@_warning:n {no-mapping} } } -%</luatex> +%</LU> % \end{macrocode} % % @@ -701,7 +701,7 @@ \@@_update_featstr:n{width=#1} } \@@_keys_define_code:nnn {fontspec} {OpticalSize} -%<*xetexx> +%<*XE> { \bool_if:NTF \l_@@_ot_bool { @@ -719,12 +719,12 @@ { \@@_warning:n {no-opticals} } } } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> { \tl_set:Nn \l_@@_optical_size_tl {/ S = #1} } -%</luatex> +%</LU> % \end{macrocode} % % \subsubsection{Font transformations} @@ -746,7 +746,7 @@ }, FakeStretch .default:n = {1.2} } -%<*xetexx> +%<*XE> \keys_define:nn {fontspec} { FakeBold .code:n = @@ -755,13 +755,13 @@ }, FakeBold .default:n = {1.5} } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> \keys_define:nn {fontspec} { FakeBold .code:n = { \@@_warning:n {fakebold-only-xetex} } } -%</luatex> +%</LU> % \end{macrocode} % These are to be given to a shape that has no real bold/italic % to signal that \pkg{fontspec} should automatically create `fake' shapes. @@ -843,7 +843,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -855,7 +855,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx index 2511a9c3cd4..885150faa59 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx @@ -1,10 +1,10 @@ %%^^A%% fontspec-lang.dtx -- part of FONTSPEC <wspr.io/fontspec> -% \subsection{Font language definitions} +% \section{Font language definitions} % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -395,7 +395,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -407,7 +407,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx index 162c0a4a0d5..0b61fea3096 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx @@ -89,7 +89,9 @@ end % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-math.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-math.dtx index bdc1c2e18d2..1a1623a5eba 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-math.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-math.dtx @@ -8,7 +8,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -30,7 +30,7 @@ { \bool_set_false:N \g_@@_pkg_euler_loaded_bool } -\cs_set:Nn \fontspec_setup_maths: +\cs_new:Nn \fontspec_setup_maths: { \@ifpackageloaded{euler} { @@ -232,7 +232,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -244,7 +244,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx index 77ef3def228..2cbcd4d6015 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx @@ -2,9 +2,11 @@ % % \section{Error/warning/info messages} % +% \iffalse % \begin{macrocode} %<*fontspec> % \end{macrocode} +% \fi % % Shorthands for messages: % \begin{macrocode} @@ -39,10 +41,6 @@ \exp_not:N#1can only be used in the second argument to \string\DeclareUnicodeEncoding. } -\@@_msg_new:nnn {fontspec} {only-import-tu} - { - The "\string\ImportEncoding" command can only take "TU" as an argument at this stage. - } \@@_msg_new:nnn {fontspec} {no-size-info} { Size information must be supplied.\\ @@ -263,9 +261,11 @@ \char_set_catcode_ignore:n {32} % \end{macrocode} % +% \iffalse % \begin{macrocode} %</fontspec> % \end{macrocode} +% \fi \endinput @@ -275,7 +275,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx index b8e642a6215..636f98cf5b6 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -58,8 +58,8 @@ } \bool_if:NTF \g_@@_euenc_bool { -%<xetexx> \tl_set:Nn \g_fontspec_encoding_tl {EU1} -%<luatex> \tl_set:Nn \g_fontspec_encoding_tl {EU2} +%<XE> \tl_set:Nn \g_fontspec_encoding_tl {EU1} +%<LU> \tl_set:Nn \g_fontspec_encoding_tl {EU2} } { \tl_set:Nn \g_fontspec_encoding_tl { TU } } % \end{macrocode} @@ -92,10 +92,10 @@ % \begin{macrocode} \bool_if:NT \g_@@_euenc_bool { -%<luatex> \cs_set_eq:NN \fontspec_tmp: \XeTeXpicfile -%<luatex> \cs_set:Npn \XeTeXpicfile {} +%<LU> \cs_set_eq:NN \fontspec_tmp: \XeTeXpicfile +%<LU> \cs_set:Npn \XeTeXpicfile {} \RequirePackage{xunicode} -%<luatex> \cs_set_eq:NN \XeTeXpicfile \fontspec_tmp: +%<LU> \cs_set_eq:NN \XeTeXpicfile \fontspec_tmp: } % \end{macrocode} % @@ -161,7 +161,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -173,7 +173,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx index f825ed249d7..3e36172d19f 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx @@ -4,7 +4,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -151,7 +151,7 @@ { \bool_if:NTF \l_@@_never_check_bool { \prg_return_true: } -%<*xetexx> +%<*XE> { \@@_iv_str_to_num:Nn \l_@@_strnum_int {#2} \int_set:Nn \l_tmpb_int { \XeTeXOTcountscripts #1 } @@ -168,8 +168,8 @@ } \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false: } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> { \cs_if_eq:NNTF #1 \font { \tl_set:Nx \l_@@_tmp_tl {\curr@fontshape/\f@size} } @@ -177,7 +177,7 @@ \directlua{fontspec.check_ot_script("\l_@@_tmp_tl", "#2")} \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false: } -%</luatex> +%</LU> } % \end{macrocode} % \end{macro} @@ -193,7 +193,7 @@ { \bool_if:NTF \l_@@_never_check_bool { \prg_return_true: } -%<*xetexx> +%<*XE> { \@@_iv_str_to_num:Nn \l_@@_strnum_int {#2} \int_set:Nn \l_tmpb_int @@ -211,8 +211,8 @@ } \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false: } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> { \cs_if_eq:NNTF #1 \font { \tl_set:Nx \l_@@_tmp_tl {\curr@fontshape/\f@size} } @@ -223,7 +223,7 @@ } \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false: } -%</luatex> +%</LU> } % \end{macrocode} % \end{macro} @@ -240,7 +240,7 @@ { \bool_if:NTF \l_@@_never_check_bool { \prg_return_true: } -%<*xetexx> +%<*XE> { %<debug>\typeout{::~ fontspec_check_ot_feat:n~ {#1}} \int_set:Nn \l_tmpb_int @@ -264,8 +264,8 @@ } \bool_if:NTF \l_@@_check_bool \prg_return_true: \prg_return_false: } -%</xetexx> -%<*luatex> +%</XE> +%<*LU> { %<debug>\typeout{::~ fontspec_check_ot_feat:n~ {#1}} \cs_if_eq:NNTF #1 \font @@ -280,7 +280,7 @@ } \bool_if:NTF \l_@@_check_bool \prg_return_true: \prg_return_false: } -%</luatex> +%</LU> } % \end{macrocode} % \end{macro} @@ -414,7 +414,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -427,7 +427,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx index 2b75aeb81d0..a569dbac43c 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx @@ -197,7 +197,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx index ab4bb8e6bee..909bd2b8bb5 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx @@ -1,10 +1,10 @@ %%^^A%% fontspec-scripts.dtx -- part of FONTSPEC <wspr.io/fontspec> -% \subsection{Font script definitions} +% \section{Font script definitions} % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -160,7 +160,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -172,7 +172,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx index 931df1632e0..c628adbbe19 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx @@ -5,7 +5,7 @@ % % \iffalse % \begin{macrocode} -%<*fontspec&(xetexx|luatex)> +%<*fontspec> % \end{macrocode} % \fi % @@ -17,7 +17,7 @@ % font name and the optional requested features of that % font. Then this new font family is selected. % \begin{macrocode} -\cs_set:Nn \@@_main_fontspec:nn +\cs_new:Nn \@@_main_fontspec:nn { \fontspec_set_family:Nnn \f@family {#1} {#2} \fontencoding { \l_@@_nfss_enc_tl } @@ -29,12 +29,13 @@ % % \begin{macro}{\setmainfont} % The following three macros perform equivalent operations setting -% the default font for a -% particular family: `roman', sans serif, or typewriter -% (monospaced). I end them with |\normalfont| so that if they're +% the default font for a particular family: `roman', sans serif, or typewriter +% (monospaced). +% +% They end with |\normalfont| so that if they're % used in the document, the change registers immediately. % \begin{macrocode} -\cs_set:Nn \@@_main_setmainfont:nn +\cs_new:Nn \@@_main_setmainfont:nn { \fontspec_set_family:Nnn \g_@@_rmfamily_family {#1} {#2} \tl_set_eq:NN \rmdefault \g_@@_rmfamily_family @@ -55,8 +56,9 @@ % \end{macro} % % \begin{macro}{\setsansfont} +% Same as above. % \begin{macrocode} -\cs_set:Nn \@@_main_setsansfont:nn +\cs_new:Nn \@@_main_setsansfont:nn { \fontspec_set_family:Nnn \g_@@_sffamily_family {#1} {#2} \tl_set_eq:NN \sfdefault \g_@@_sffamily_family @@ -77,8 +79,9 @@ % \end{macro} % % \begin{macro}{\setmonofont} +% Same as above. % \begin{macrocode} -\cs_set:Nn \@@_main_setmonofont:nn +\cs_new:Nn \@@_main_setmonofont:nn { \fontspec_set_family:Nnn \g_@@_ttfamily_family {#1} {#2} \tl_set_eq:NN \ttdefault \g_@@_ttfamily_family @@ -108,7 +111,7 @@ % document. \cmd\setboldmathrm\ is used for specifying which % fonts should be used in \cmd\boldmath. % \begin{macrocode} -\cs_set:Nn \@@_main_setmathrm:nn +\cs_new:Nn \@@_main_setmathrm:nn { %<XE> \fontspec_set_family:Nnn \g_@@_mathrm_tl {#1} {#2} %<LU> \fontspec_set_family:Nnn \g_@@_mathrm_tl {Renderer=Basic,#1} {#2} @@ -119,7 +122,7 @@ % % \begin{macro}{\setboldmathrm} % \begin{macrocode} -\cs_set:Nn \@@_main_setboldmathrm:nn +\cs_new:Nn \@@_main_setboldmathrm:nn { %<XE> \fontspec_set_family:Nnn \g_@@_bfmathrm_tl {#1} {#2} %<LU> \fontspec_set_family:Nnn \g_@@_bfmathrm_tl {Renderer=Basic,#1} {#2} @@ -130,7 +133,7 @@ % % \begin{macro}{\setmathsf} % \begin{macrocode} -\cs_set:Nn \@@_main_setmathsf:nn +\cs_new:Nn \@@_main_setmathsf:nn { %<XE> \fontspec_set_family:Nnn \g_@@_mathsf_tl {#1} {#2} %<LU> \fontspec_set_family:Nnn \g_@@_mathsf_tl {Renderer=Basic,#1} {#2} @@ -141,7 +144,7 @@ % % \begin{macro}{\setmathtt} % \begin{macrocode} -\cs_set:Nn \@@_main_setmathtt:nn +\cs_new:Nn \@@_main_setmathtt:nn { %<XE> \fontspec_set_family:Nnn \g_@@_mathtt_tl {#1} {#2} %<LU> \fontspec_set_family:Nnn \g_@@_mathtt_tl {Renderer=Basic,#1} {#2} @@ -189,7 +192,7 @@ % \cs{l_fontspec_family_tl}. This family is then used in a typical NFSS \cmd\fontfamily\ % declaration, saved in the macro name specified. % \begin{macrocode} -\cs_set:Nn \@@_main_newfontfamily:nnn +\cs_new:Nn \@@_main_newfontfamily:nnn { \fontspec_set_family:cnn { g_@@_ \cs_to_str:N #1 _family } {#2} {#3} \use:x @@ -208,7 +211,7 @@ % \begin{macro}{\newfontface} % \cmd\newfontface\ uses the fact that if the argument to \feat{BoldFont}, etc., is empty (\ie, |BoldFont={}|), then no bold font is searched for. % \begin{macrocode} -\cs_set:Nn \@@_main_newfontface:nnn +\cs_new:Nn \@@_main_newfontface:nnn { \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3} } @@ -225,7 +228,7 @@ % concatenated with the individual macro choices in the % [...] macro. % \begin{macrocode} -\cs_set:Nn \@@_main_defaultfontfeatures:nnn +\cs_new:Nn \@@_main_defaultfontfeatures:nnn { \IfNoValueTF {#2} { \@@_set_default_features:nn {#1} {#3} } @@ -292,7 +295,7 @@ % \cs{addfontfeature} is defined as an alias, as I found that I % often typed this instead when adding only a single font feature. % \begin{macrocode} -\cs_set:Nn \@@_main_addfontfeatures:n +\cs_new:Nn \@@_main_addfontfeatures:n { %<debug> \typeout{^^J::::::::::::::::::::::::::::::::::^^J: addfontfeatures} \fontspec_if_fontspec_font:TF @@ -326,7 +329,7 @@ % tag by which to reference it, and the string that is used to % select the font feature. % \begin{macrocode} -\cs_set:Nn \@@_main_newfontfeature:nn +\cs_new:Nn \@@_main_newfontfeature:nn { \keys_define:nn { fontspec } { @@ -345,7 +348,7 @@ % Better than \cmd\newfontfeature\ because it checks if the feature exists in the % font it's being used for. % \begin{macrocode} -\cs_set:Nn \@@_main_newAATfeature:nnnn +\cs_new:Nn \@@_main_newAATfeature:nnnn { \keys_if_exist:nnF { fontspec } {#1} { \@@_define_aat_feature_group:n {#1} } @@ -363,7 +366,7 @@ % Better than \cmd\newfontfeature\ because it checks if the feature exists in the % font it's being used for. % \begin{macrocode} -\cs_set:Nn \@@_main_newopentypefeature:nnn +\cs_new:Nn \@@_main_newopentypefeature:nnn { \keys_if_exist:nnF { fontspec / options } {#1} { \@@_define_opentype_feature_group:n {#1} } @@ -390,7 +393,7 @@ % \begin{macro}{\aliasfontfeature} % User commands for renaming font features and font feature options. % \begin{macrocode} -\cs_set:Nn \@@_main_aliasfontfeature:nn +\cs_new:Nn \@@_main_aliasfontfeature:nn { %<debug> \typeout{::::::::::::::::::::^^J:: aliasfontfeature{#1}{#2}} \bool_set_false:N \l_@@_alias_bool @@ -414,7 +417,7 @@ % % \begin{macro}{\aliasfontfeatureoption} % \begin{macrocode} -\cs_set:Nn \@@_main_aliasfontfeatureoption:nnn +\cs_new:Nn \@@_main_aliasfontfeatureoption:nnn { \bool_set_false:N \l_@@_alias_bool @@ -453,7 +456,7 @@ % \begin{macro}{\DeclareFontsExtensions} % \texttt{dfont} would never be uppercase, right? % \begin{macrocode} -\cs_set:Nn \@@_main_DeclareFontsExtensions:n +\cs_new:Nn \@@_main_DeclareFontsExtensions:n { \clist_set:Nn \l_@@_extensions_clist { #1 } \tl_remove_all:Nn \l_@@_extensions_clist {~} @@ -468,7 +471,7 @@ % % \begin{macro}{\IfFontFeatureActiveTF} % \begin{macrocode} -\cs_set:Nn \@@_main_IfFontFeatureActiveTF:nnn +\cs_new:Nn \@@_main_IfFontFeatureActiveTF:nnn { %<debug> \typeout{^^J:::::::::::::::::::::::::::::::::::::::::::::::} %<debug> \typeout{:IfFontFeatureActiveTF \exp_not:n{{#1}{#2}{#3}}} @@ -504,7 +507,7 @@ % % \iffalse % \begin{macrocode} -%</fontspec&(xetexx|luatex)> +%</fontspec> % \end{macrocode} % \fi @@ -516,7 +519,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx index 902b9f470c5..f388fb8738c 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx @@ -2,12 +2,20 @@ % % \section{Declaration of variables} % +% \iffalse % \begin{macrocode} %<*fontspec> % \end{macrocode} +% \fi +% +% This file consists solely of declaration of variables used by \pkg{fontspec}. +% In some cases these variables are also initialised with default values. +% In time I would like to move these initialisations % % \paragraph{Booleans} -% \subparagraph{firsttime} As \cs{keys_set:nn} is run multiple times, some of its +% +% \begin{macro}{\l_@@_firsttime_bool} +% As \cs{keys_set:nn} is run multiple times, some of its % information storing only occurs once while we decide if the font family % has been defined or not. When the later processing is occuring per-shape % this no longer needs to happen; this is indicated by the `firsttime' @@ -15,6 +23,8 @@ % \begin{macrocode} \bool_new:N \l_@@_firsttime_bool % \end{macrocode} +% \end{macro} +% % \begin{macrocode} \bool_new:N \l_@@_nobf_bool \bool_new:N \l_@@_noit_bool @@ -67,7 +77,7 @@ \int_new:N \l_@@_strongdef_int % \end{macrocode} % -% \paragraph{Floating point} +% \paragraph{Floats} % \begin{macrocode} \fp_new:N \l_@@_tmpa_fp \fp_new:N \l_@@_tmpb_fp @@ -78,10 +88,14 @@ \dim_new:N \l_@@_tmpa_dim \dim_new:N \l_@@_tmpb_dim \dim_new:N \l_@@_tmpc_dim +% \end{macrocode} +% +% \paragraph{Sequences} +% \begin{macrocode} \seq_new:N \g_@@_bf_series_seq % \end{macrocode} % -% \paragraph{Comma lists} +% \paragraph{Comma-lists} % \begin{macrocode} \clist_new:N \g_@@_default_fontopts_clist \clist_new:N \g_@@_all_keyval_modules_clist @@ -120,7 +134,6 @@ % \end{macrocode} % % \paragraph{Token lists} -% % \begin{macrocode} \tl_new:N \l_fontspec_family_tl \tl_new:N \g_fontspec_encoding_tl @@ -130,9 +143,9 @@ % \end{macrocode} % % \begin{macrocode} -\tl_new:N \UTFencname -\tl_new:N \cyrillicencoding -\tl_new:N \latinencoding +\tl_clear_new:N \UTFencname +\tl_clear_new:N \cyrillicencoding +\tl_clear_new:N \latinencoding % \end{macrocode} % % \begin{macrocode} @@ -162,17 +175,6 @@ % \end{macrocode} % % \begin{macrocode} -\tl_new:N \l_@@_rawfeatures_sclist -\tl_new:N \l_@@_pre_feat_sclist -% \end{macrocode} -% -% \begin{macrocode} -\tl_new:N \g_@@_rmfamily_family -\tl_new:N \g_@@_sffamily_family -\tl_new:N \g_@@_ttfamily_family -% \end{macrocode} -% -% \begin{macrocode} \tl_new:N \g_@@_mathrm_tl \tl_new:N \g_@@_bfmathrm_tl \tl_new:N \g_@@_mathsf_tl @@ -215,12 +217,28 @@ \tl_set:Nn \g_@@_postadjust_tl { \l_@@_wordspace_adjust_tl \l_@@_punctspace_adjust_tl } % \end{macrocode} % +% \paragraph{Semi-colon-lists} +% Not a real data structure but sensible to name accordingly. +% \begin{macrocode} +\tl_new:N \l_@@_rawfeatures_sclist +\tl_new:N \l_@@_pre_feat_sclist +% \end{macrocode} +% +% \paragraph{Font families} +% Again not a real data structure, and also probably poorly named. +% \begin{macrocode} +\tl_new:N \g_@@_rmfamily_family +\tl_new:N \g_@@_sffamily_family +\tl_new:N \g_@@_ttfamily_family +% \end{macrocode} % % % +% \iffalse % \begin{macrocode} %</fontspec> % \end{macrocode} +% \fi \endinput @@ -230,7 +248,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-xfss.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-xfss.dtx index 55e0c40716a..7886ae528db 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-xfss.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-xfss.dtx @@ -275,7 +275,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx index add007bb14b..84abbe7aae2 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx @@ -1,6 +1,10 @@ %%^^A%% fontspec.dtx -- part of FONTSPEC <wspr.io/fontspec> -% \iffalse +% \section{Package declaration} +% +% List all \texttt{dtx} files for running the \texttt{ins} file +% and typesetting the code. +% \begin{macrocode} %<*dtx> \gdef\FONTSPECDTX{ \DTX{fontspec.dtx} @@ -27,33 +31,72 @@ \DTX{fontspec-patches.dtx} } %</dtx> -%<*driver> +% \end{macrocode} +% +% Now exit if we're using plain \TeX; this would usually be the case when +% loading this file with \texttt{fontspec.ins}. +% \begin{macrocode} +%<*dtx> \def\tmpa{plain} \ifx\tmpa\fmtname\expandafter\endinput\fi -%</driver> +%</dtx> +% \end{macrocode} +% +% Metadata for documentation; the official title and authors of the package. +% \begin{macrocode} +%<*dtx> +\title{ + The \textsf{fontspec} package\\ + Font selection for \XeLaTeX\ and \LuaLaTeX +} +\author{ + \textsc{Will Robertson}\\ + With contributions by Khaled Hosny,\\ + Philipp Gesang, Joseph Wright, and others.\\ + \url{http://wspr.io/fontspec/} +} +%</dtx> +% \end{macrocode} +% +% Declare the package version and date for each of the \texttt{.sty} files generated. +% In addition, declare the version and date for this \texttt{.dtx} file. +% \begin{macrocode} %<fontspec>\RequirePackage{xparse} %<fontspec&load>\ProvidesExplPackage{fontspec}% -%<fontspec&xetexx>\ProvidesExplPackage{fontspec-xetex}% -%<fontspec&luatex>\ProvidesExplPackage{fontspec-luatex}% -%<*driver> +%<fontspec&XE>\ProvidesExplPackage{fontspec-xetex}% +%<fontspec&LU>\ProvidesExplPackage{fontspec-luatex}% +%<*dtx> \RequirePackage{xparse} \ProvidesExplFile{fontspec.dtx} -%</driver> +%</dtx> %<*fontspec> - {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX} + {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX} %</fontspec> +% \end{macrocode} +% +% Here the version and date are setup for typesetting the documentation. +% \begin{macrocode} +%<*dtx> +\GetFileInfo{fontspec.dtx} +\date{\filedate \qquad \fileversion} +%</dtx> +% \end{macrocode} +% +% \subsection{\textsf{Lua} header} +% +% \begin{macrocode} %<lua>fontspec = fontspec or {} %<lua>local fontspec = fontspec %<lua>fontspec.module = { %<lua> name = "fontspec", -%<lua> version = "2.6f", -%<lua> date = "2017/11/05", +%<lua> version = "2.6g", +%<lua> date = "2017/11/09", %<lua> description = "Font selection for XeLaTeX and LuaLaTeX", %<lua> author = "Khaled Hosny, Philipp Gesang, Will Robertson", %<lua> copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", -%<lua> license = "LPPL" +%<lua> license = "LPPL v1.3c" %<lua>} -% \fi +% \end{macrocode} \endinput @@ -62,7 +105,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.ins b/Master/texmf-dist/source/latex/fontspec/fontspec.ins index ded3b28730c..9952c8729db 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.ins +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.ins @@ -20,8 +20,13 @@ the conditions of the LaTeX Project Public License, version 1.3c or higher \endpreamble \nopostamble \askforoverwritefalse + \def\MetaPrefix{-- } -\generate{\file{fontspec.lua}{\from{fontspec.dtx}{lua}\from{fontspec-lua.dtx}{lua}}} +\generate{\file{fontspec.lua}{ + \from{fontspec.dtx}{lua} + \from{fontspec-lua.dtx}{lua} +}} + \let\MetaPrefix\DoubleperCent \ifx\FontspecDebug\undefined\def\FSDEBUG{}\else\def\FSDEBUG{,debug}\fi @@ -30,10 +35,10 @@ the conditions of the LaTeX Project Public License, version 1.3c or higher \from{fontspec-code-load.dtx}{fontspec,load\FSDEBUG} }} -\def\DTX#1{\from{#1}{fontspec,XE,xetexx\FSDEBUG}} +\def\DTX#1{\from{#1}{fontspec,XE\FSDEBUG}} \generate{\file{fontspec-xetex.sty}{\FONTSPECDTX}} -\def\DTX#1{\from{#1}{fontspec,LU,luatex\FSDEBUG}} +\def\DTX#1{\from{#1}{fontspec,LU\FSDEBUG}} \generate{\file{fontspec-luatex.sty}{\FONTSPECDTX}} \endbatchfile @@ -44,7 +49,9 @@ the conditions of the LaTeX Project Public License, version 1.3c or higher % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.ltx b/Master/texmf-dist/source/latex/fontspec/fontspec.ltx index c1eeeecdc9b..7214efd4ca6 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.ltx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.ltx @@ -7,15 +7,6 @@ \documentclass[a4paper]{l3doc} \usepackage{fontspec-doc-style} \begin{document} - -\GetFileInfo{fontspec.dtx} -\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX} -\author{ - \textsc{Will Robertson} and \textsc{Khaled Hosny}\\ - \url{http://wspr.io/fontspec/} -} -\date{\filedate \qquad \fileversion} - \maketitle \tableofcontents \newpage @@ -38,7 +29,9 @@ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ % Copyright 2004-2017 Will Robertson, LPPL "maintainer" -% Copyright 2009-2013 Khaled Hosny +% Copyright 2009-2015 Khaled Hosny +% Copyright 2013 Philipp Gesang +% Copyright 2013-2016 Joseph Wright % ------------------------------------------------ % This package is free software and may be redistributed and/or modified under % the conditions of the LaTeX Project Public License, version 1.3c or higher diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index 6e2c8103c2b..3a9e2cd6ab3 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -4,28 +4,28 @@ %% %% The original source files were: %% -%% fontspec.dtx (with options: `fontspec,LU,luatex') -%% fontspec-code-load.dtx (with options: `fontspec,LU,luatex') -%% fontspec-vars.dtx (with options: `fontspec,LU,luatex') -%% fontspec-msg.dtx (with options: `fontspec,LU,luatex') -%% fontspec-opening.dtx (with options: `fontspec,LU,luatex') -%% fontspec-fontload.dtx (with options: `fontspec,LU,luatex') -%% fontspec-interfaces.dtx (with options: `fontspec,LU,luatex') -%% fontspec-user.dtx (with options: `fontspec,LU,luatex') -%% fontspec-api.dtx (with options: `fontspec,LU,luatex') -%% fontspec-internal.dtx (with options: `fontspec,LU,luatex') -%% fontspec-opentype.dtx (with options: `fontspec,LU,luatex') -%% fontspec-graphite.dtx (with options: `fontspec,LU,luatex') -%% fontspec-keyval.dtx (with options: `fontspec,LU,luatex') -%% fontspec-feat-opentype.dtx (with options: `fontspec,LU,luatex') -%% fontspec-scripts.dtx (with options: `fontspec,LU,luatex') -%% fontspec-lang.dtx (with options: `fontspec,LU,luatex') -%% fontspec-feat-aat.dtx (with options: `fontspec,LU,luatex') -%% fontspec-enc.dtx (with options: `fontspec,LU,luatex') -%% fontspec-math.dtx (with options: `fontspec,LU,luatex') -%% fontspec-closing.dtx (with options: `fontspec,LU,luatex') -%% fontspec-xfss.dtx (with options: `fontspec,LU,luatex') -%% fontspec-patches.dtx (with options: `fontspec,LU,luatex') +%% fontspec.dtx (with options: `fontspec,LU') +%% fontspec-code-load.dtx (with options: `fontspec,LU') +%% fontspec-vars.dtx (with options: `fontspec,LU') +%% fontspec-msg.dtx (with options: `fontspec,LU') +%% fontspec-opening.dtx (with options: `fontspec,LU') +%% fontspec-fontload.dtx (with options: `fontspec,LU') +%% fontspec-interfaces.dtx (with options: `fontspec,LU') +%% fontspec-user.dtx (with options: `fontspec,LU') +%% fontspec-api.dtx (with options: `fontspec,LU') +%% fontspec-internal.dtx (with options: `fontspec,LU') +%% fontspec-opentype.dtx (with options: `fontspec,LU') +%% fontspec-graphite.dtx (with options: `fontspec,LU') +%% fontspec-keyval.dtx (with options: `fontspec,LU') +%% fontspec-feat-opentype.dtx (with options: `fontspec,LU') +%% fontspec-scripts.dtx (with options: `fontspec,LU') +%% fontspec-lang.dtx (with options: `fontspec,LU') +%% fontspec-feat-aat.dtx (with options: `fontspec,LU') +%% fontspec-enc.dtx (with options: `fontspec,LU') +%% fontspec-math.dtx (with options: `fontspec,LU') +%% fontspec-closing.dtx (with options: `fontspec,LU') +%% fontspec-xfss.dtx (with options: `fontspec,LU') +%% fontspec-patches.dtx (with options: `fontspec,LU') %% ------------------------------------------------ %% The FONTSPEC package <wspr.io/fontspec> %% ------------------------------------------------ @@ -40,7 +40,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec-luatex}% - {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX} + {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> %%^^A%% fontspec-vars.dtx -- part of FONTSPEC <wspr.io/fontspec> @@ -116,9 +116,9 @@ \tl_new:N \l_fontspec_renderer_tl \tl_new:N \l_fontspec_fontname_tl \tl_new:N \l_fontspec_defined_shapes_tl -\tl_new:N \UTFencname -\tl_new:N \cyrillicencoding -\tl_new:N \latinencoding +\tl_clear_new:N \UTFencname +\tl_clear_new:N \cyrillicencoding +\tl_clear_new:N \latinencoding \tl_new:N \g__fontspec_single_feat_tl \tl_new:N \l__fontspec_tmp_tl \tl_new:N \l__fontspec_size_tl @@ -142,11 +142,6 @@ \tl_new:N \g__fontspec_curr_series_tl \tl_new:N \l__fontspec_options_tl \tl_new:N \l__fontspec_fontname_tl -\tl_new:N \l__fontspec_rawfeatures_sclist -\tl_new:N \l__fontspec_pre_feat_sclist -\tl_new:N \g__fontspec_rmfamily_family -\tl_new:N \g__fontspec_sffamily_family -\tl_new:N \g__fontspec_ttfamily_family \tl_new:N \g__fontspec_mathrm_tl \tl_new:N \g__fontspec_bfmathrm_tl \tl_new:N \g__fontspec_mathsf_tl @@ -175,6 +170,11 @@ \tl_new:N \l__fontspec_postadjust_tl \tl_new:N \g__fontspec_postadjust_tl \tl_set:Nn \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl } +\tl_new:N \l__fontspec_rawfeatures_sclist +\tl_new:N \l__fontspec_pre_feat_sclist +\tl_new:N \g__fontspec_rmfamily_family +\tl_new:N \g__fontspec_sffamily_family +\tl_new:N \g__fontspec_ttfamily_family %%^^A%% fontspec-msg.dtx -- part of FONTSPEC <wspr.io/fontspec> \cs_new:Npn \__fontspec_error:n { \msg_error:nn {fontspec} } @@ -199,10 +199,6 @@ \exp_not:N#1can only be used in the second argument to \string\DeclareUnicodeEncoding. } -\__fontspec_msg_new:nnn {fontspec} {only-import-tu} - { - The "\string\ImportEncoding" command can only take "TU" as an argument at this stage. - } \__fontspec_msg_new:nnn {fontspec} {no-size-info} { Size information must be supplied.\\ @@ -642,14 +638,14 @@ %%^^A%% fontspec-user.dtx -- part of FONTSPEC <wspr.io/fontspec> -\cs_set:Nn \__fontspec_main_fontspec:nn +\cs_new:Nn \__fontspec_main_fontspec:nn { \fontspec_set_family:Nnn \f@family {#1} {#2} \fontencoding { \l__fontspec_nfss_enc_tl } \selectfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setmainfont:nn +\cs_new:Nn \__fontspec_main_setmainfont:nn { \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1} {#2} \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family @@ -666,7 +662,7 @@ \normalfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setsansfont:nn +\cs_new:Nn \__fontspec_main_setsansfont:nn { \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1} {#2} \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family @@ -683,7 +679,7 @@ \normalfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setmonofont:nn +\cs_new:Nn \__fontspec_main_setmonofont:nn { \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1} {#2} \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family @@ -700,22 +696,22 @@ \normalfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setmathrm:nn +\cs_new:Nn \__fontspec_main_setmathrm:nn { \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {Renderer=Basic,#1} {#2} \__fontspec_setmathrm_hook:nn {#1} {#2} } -\cs_set:Nn \__fontspec_main_setboldmathrm:nn +\cs_new:Nn \__fontspec_main_setboldmathrm:nn { \fontspec_set_family:Nnn \g__fontspec_bfmathrm_tl {Renderer=Basic,#1} {#2} \__fontspec_setboldmathrm_hook:nn {#1} {#2} } -\cs_set:Nn \__fontspec_main_setmathsf:nn +\cs_new:Nn \__fontspec_main_setmathsf:nn { \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {Renderer=Basic,#1} {#2} \__fontspec_setmathsf_hook:nn {#1} {#2} } -\cs_set:Nn \__fontspec_main_setmathtt:nn +\cs_new:Nn \__fontspec_main_setmathtt:nn { \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {Renderer=Basic,#1} {#2} \__fontspec_setmathtt_hook:nn {#1} {#2} @@ -734,7 +730,7 @@ \tl_set:Nn \g__fontspec_mathrm_tl {\rmdefault} \tl_set:Nn \g__fontspec_mathsf_tl {\sfdefault} \tl_set:Nn \g__fontspec_mathtt_tl {\ttdefault} -\cs_set:Nn \__fontspec_main_newfontfamily:nnn +\cs_new:Nn \__fontspec_main_newfontfamily:nnn { \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3} \use:x @@ -747,11 +743,11 @@ } } } -\cs_set:Nn \__fontspec_main_newfontface:nnn +\cs_new:Nn \__fontspec_main_newfontface:nnn { \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3} } -\cs_set:Nn \__fontspec_main_defaultfontfeatures:nnn +\cs_new:Nn \__fontspec_main_defaultfontfeatures:nnn { \IfNoValueTF {#2} { \__fontspec_set_default_features:nn {#1} {#3} } @@ -785,7 +781,7 @@ } } } -\cs_set:Nn \__fontspec_main_addfontfeatures:n +\cs_new:Nn \__fontspec_main_addfontfeatures:n { \fontspec_if_fontspec_font:TF { @@ -807,7 +803,7 @@ } \ignorespaces } -\cs_set:Nn \__fontspec_main_newfontfeature:nn +\cs_new:Nn \__fontspec_main_newfontfeature:nn { \keys_define:nn { fontspec } { @@ -817,7 +813,7 @@ } } } -\cs_set:Nn \__fontspec_main_newAATfeature:nnnn +\cs_new:Nn \__fontspec_main_newAATfeature:nnnn { \keys_if_exist:nnF { fontspec } {#1} { \__fontspec_define_aat_feature_group:n {#1} } @@ -827,7 +823,7 @@ \__fontspec_define_aat_feature:nnnn {#1}{#2}{#3}{#4} } -\cs_set:Nn \__fontspec_main_newopentypefeature:nnn +\cs_new:Nn \__fontspec_main_newopentypefeature:nnn { \keys_if_exist:nnF { fontspec / options } {#1} { \__fontspec_define_opentype_feature_group:n {#1} } @@ -843,7 +839,7 @@ { \str_case:nnF {#1} { {+} {#2} {-} {#2} } {#1#2} } -\cs_set:Nn \__fontspec_main_aliasfontfeature:nn +\cs_new:Nn \__fontspec_main_aliasfontfeature:nn { \bool_set_false:N \l__fontspec_alias_bool @@ -860,7 +856,7 @@ \bool_if:NF \l__fontspec_alias_bool { \__fontspec_warning:nx {rename-feature-not-exist} {#1} } } -\cs_set:Nn \__fontspec_main_aliasfontfeatureoption:nnn +\cs_new:Nn \__fontspec_main_aliasfontfeatureoption:nnn { \bool_set_false:N \l__fontspec_alias_bool @@ -889,13 +885,13 @@ \bool_if:NF \l__fontspec_alias_bool { \__fontspec_warning:nx {rename-feature-not-exist} {#1/#2} } } -\cs_set:Nn \__fontspec_main_DeclareFontsExtensions:n +\cs_new:Nn \__fontspec_main_DeclareFontsExtensions:n { \clist_set:Nn \l__fontspec_extensions_clist { #1 } \tl_remove_all:Nn \l__fontspec_extensions_clist {~} } \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont} -\cs_set:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn +\cs_new:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn { \__fontspec_if_font_feature:nTF {#1} {#2} {#3} } @@ -1256,13 +1252,13 @@ { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } {} } {\f@size pt} \l_fontspec_font % this is necessary for LuaLaTeX to check the scripts properly } -\cs_set:Nn \__fontspec_construct_font_call:nnnnnn +\cs_new:Nn \__fontspec_construct_font_call:nnnnnn { " \__fontspec_fontname_wrap:n { #1 #2 } #3 #4 #5 \str_if_eq_x:nnF {#6}{} {:#6} " } -\cs_set:Nn \__fontspec_construct_font_call:nn +\cs_new:Nn \__fontspec_construct_font_call:nn { \__fontspec_construct_font_call:nnnnnn {#1} @@ -1310,7 +1306,7 @@ } } } -\cs_set:Nn \__fontspec_get_features:Nn +\cs_new:Nn \__fontspec_get_features:Nn { \__fontspec_init_fontface: \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2} @@ -1420,7 +1416,7 @@ \fontspec_complete_fontname:Nn \l__fontspec_curr_fontname_tl {#3} \__fontspec_make_font_shapes:Nnnnn \l__fontspec_curr_fontname_tl {#1} {#2} {#4} {#5} } -\cs_set:Nn \fontspec_complete_fontname:Nn +\cs_new:Nn \fontspec_complete_fontname:Nn { \tl_set:Nx #1 {#2} \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl} @@ -1632,7 +1628,7 @@ language = \l_fontspec_lang_tl ; } } -\cs_set:Nn \__fontspec_make_smallcaps:TF +\cs_new:Nn \__fontspec_make_smallcaps:TF { \__fontspec_check_ot_feat:NnTF \l_fontspec_font {smcp} {#1} {#2} } @@ -1680,7 +1676,7 @@ \tl_clear:N \l__fontspec_wordspace_adjust_tl \tl_clear:N \l__fontspec_punctspace_adjust_tl } -\cs_set:Nn \__fontspec_iv_str_to_num:Nn +\cs_new:Nn \__fontspec_iv_str_to_num:Nn { \__fontspec_strip_leading_sign:Nw #1#2 \q_nil } @@ -3451,7 +3447,7 @@ { \bool_set_false:N \g__fontspec_pkg_euler_loaded_bool } -\cs_set:Nn \fontspec_setup_maths: +\cs_new:Nn \fontspec_setup_maths: { \@ifpackageloaded{euler} { diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index 39c0e81ba85..5211738902a 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty @@ -4,28 +4,28 @@ %% %% The original source files were: %% -%% fontspec.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-code-load.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-vars.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-msg.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-opening.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-fontload.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-interfaces.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-user.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-api.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-internal.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-opentype.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-graphite.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-keyval.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-feat-opentype.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-scripts.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-lang.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-feat-aat.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-enc.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-math.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-closing.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-xfss.dtx (with options: `fontspec,XE,xetexx') -%% fontspec-patches.dtx (with options: `fontspec,XE,xetexx') +%% fontspec.dtx (with options: `fontspec,XE') +%% fontspec-code-load.dtx (with options: `fontspec,XE') +%% fontspec-vars.dtx (with options: `fontspec,XE') +%% fontspec-msg.dtx (with options: `fontspec,XE') +%% fontspec-opening.dtx (with options: `fontspec,XE') +%% fontspec-fontload.dtx (with options: `fontspec,XE') +%% fontspec-interfaces.dtx (with options: `fontspec,XE') +%% fontspec-user.dtx (with options: `fontspec,XE') +%% fontspec-api.dtx (with options: `fontspec,XE') +%% fontspec-internal.dtx (with options: `fontspec,XE') +%% fontspec-opentype.dtx (with options: `fontspec,XE') +%% fontspec-graphite.dtx (with options: `fontspec,XE') +%% fontspec-keyval.dtx (with options: `fontspec,XE') +%% fontspec-feat-opentype.dtx (with options: `fontspec,XE') +%% fontspec-scripts.dtx (with options: `fontspec,XE') +%% fontspec-lang.dtx (with options: `fontspec,XE') +%% fontspec-feat-aat.dtx (with options: `fontspec,XE') +%% fontspec-enc.dtx (with options: `fontspec,XE') +%% fontspec-math.dtx (with options: `fontspec,XE') +%% fontspec-closing.dtx (with options: `fontspec,XE') +%% fontspec-xfss.dtx (with options: `fontspec,XE') +%% fontspec-patches.dtx (with options: `fontspec,XE') %% ------------------------------------------------ %% The FONTSPEC package <wspr.io/fontspec> %% ------------------------------------------------ @@ -40,7 +40,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec-xetex}% - {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX} + {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> %%^^A%% fontspec-vars.dtx -- part of FONTSPEC <wspr.io/fontspec> @@ -116,9 +116,9 @@ \tl_new:N \l_fontspec_renderer_tl \tl_new:N \l_fontspec_fontname_tl \tl_new:N \l_fontspec_defined_shapes_tl -\tl_new:N \UTFencname -\tl_new:N \cyrillicencoding -\tl_new:N \latinencoding +\tl_clear_new:N \UTFencname +\tl_clear_new:N \cyrillicencoding +\tl_clear_new:N \latinencoding \tl_new:N \g__fontspec_single_feat_tl \tl_new:N \l__fontspec_tmp_tl \tl_new:N \l__fontspec_size_tl @@ -142,11 +142,6 @@ \tl_new:N \g__fontspec_curr_series_tl \tl_new:N \l__fontspec_options_tl \tl_new:N \l__fontspec_fontname_tl -\tl_new:N \l__fontspec_rawfeatures_sclist -\tl_new:N \l__fontspec_pre_feat_sclist -\tl_new:N \g__fontspec_rmfamily_family -\tl_new:N \g__fontspec_sffamily_family -\tl_new:N \g__fontspec_ttfamily_family \tl_new:N \g__fontspec_mathrm_tl \tl_new:N \g__fontspec_bfmathrm_tl \tl_new:N \g__fontspec_mathsf_tl @@ -175,6 +170,11 @@ \tl_new:N \l__fontspec_postadjust_tl \tl_new:N \g__fontspec_postadjust_tl \tl_set:Nn \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl } +\tl_new:N \l__fontspec_rawfeatures_sclist +\tl_new:N \l__fontspec_pre_feat_sclist +\tl_new:N \g__fontspec_rmfamily_family +\tl_new:N \g__fontspec_sffamily_family +\tl_new:N \g__fontspec_ttfamily_family %%^^A%% fontspec-msg.dtx -- part of FONTSPEC <wspr.io/fontspec> \cs_new:Npn \__fontspec_error:n { \msg_error:nn {fontspec} } @@ -199,10 +199,6 @@ \exp_not:N#1can only be used in the second argument to \string\DeclareUnicodeEncoding. } -\__fontspec_msg_new:nnn {fontspec} {only-import-tu} - { - The "\string\ImportEncoding" command can only take "TU" as an argument at this stage. - } \__fontspec_msg_new:nnn {fontspec} {no-size-info} { Size information must be supplied.\\ @@ -639,14 +635,14 @@ %%^^A%% fontspec-user.dtx -- part of FONTSPEC <wspr.io/fontspec> -\cs_set:Nn \__fontspec_main_fontspec:nn +\cs_new:Nn \__fontspec_main_fontspec:nn { \fontspec_set_family:Nnn \f@family {#1} {#2} \fontencoding { \l__fontspec_nfss_enc_tl } \selectfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setmainfont:nn +\cs_new:Nn \__fontspec_main_setmainfont:nn { \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1} {#2} \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family @@ -663,7 +659,7 @@ \normalfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setsansfont:nn +\cs_new:Nn \__fontspec_main_setsansfont:nn { \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1} {#2} \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family @@ -680,7 +676,7 @@ \normalfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setmonofont:nn +\cs_new:Nn \__fontspec_main_setmonofont:nn { \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1} {#2} \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family @@ -697,22 +693,22 @@ \normalfont \ignorespaces } -\cs_set:Nn \__fontspec_main_setmathrm:nn +\cs_new:Nn \__fontspec_main_setmathrm:nn { \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2} \__fontspec_setmathrm_hook:nn {#1} {#2} } -\cs_set:Nn \__fontspec_main_setboldmathrm:nn +\cs_new:Nn \__fontspec_main_setboldmathrm:nn { \fontspec_set_family:Nnn \g__fontspec_bfmathrm_tl {#1} {#2} \__fontspec_setboldmathrm_hook:nn {#1} {#2} } -\cs_set:Nn \__fontspec_main_setmathsf:nn +\cs_new:Nn \__fontspec_main_setmathsf:nn { \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2} \__fontspec_setmathsf_hook:nn {#1} {#2} } -\cs_set:Nn \__fontspec_main_setmathtt:nn +\cs_new:Nn \__fontspec_main_setmathtt:nn { \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2} \__fontspec_setmathtt_hook:nn {#1} {#2} @@ -731,7 +727,7 @@ \tl_set:Nn \g__fontspec_mathrm_tl {\rmdefault} \tl_set:Nn \g__fontspec_mathsf_tl {\sfdefault} \tl_set:Nn \g__fontspec_mathtt_tl {\ttdefault} -\cs_set:Nn \__fontspec_main_newfontfamily:nnn +\cs_new:Nn \__fontspec_main_newfontfamily:nnn { \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3} \use:x @@ -744,11 +740,11 @@ } } } -\cs_set:Nn \__fontspec_main_newfontface:nnn +\cs_new:Nn \__fontspec_main_newfontface:nnn { \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3} } -\cs_set:Nn \__fontspec_main_defaultfontfeatures:nnn +\cs_new:Nn \__fontspec_main_defaultfontfeatures:nnn { \IfNoValueTF {#2} { \__fontspec_set_default_features:nn {#1} {#3} } @@ -782,7 +778,7 @@ } } } -\cs_set:Nn \__fontspec_main_addfontfeatures:n +\cs_new:Nn \__fontspec_main_addfontfeatures:n { \fontspec_if_fontspec_font:TF { @@ -804,7 +800,7 @@ } \ignorespaces } -\cs_set:Nn \__fontspec_main_newfontfeature:nn +\cs_new:Nn \__fontspec_main_newfontfeature:nn { \keys_define:nn { fontspec } { @@ -814,7 +810,7 @@ } } } -\cs_set:Nn \__fontspec_main_newAATfeature:nnnn +\cs_new:Nn \__fontspec_main_newAATfeature:nnnn { \keys_if_exist:nnF { fontspec } {#1} { \__fontspec_define_aat_feature_group:n {#1} } @@ -824,7 +820,7 @@ \__fontspec_define_aat_feature:nnnn {#1}{#2}{#3}{#4} } -\cs_set:Nn \__fontspec_main_newopentypefeature:nnn +\cs_new:Nn \__fontspec_main_newopentypefeature:nnn { \keys_if_exist:nnF { fontspec / options } {#1} { \__fontspec_define_opentype_feature_group:n {#1} } @@ -840,7 +836,7 @@ { \str_case:nnF {#1} { {+} {#2} {-} {#2} } {#1#2} } -\cs_set:Nn \__fontspec_main_aliasfontfeature:nn +\cs_new:Nn \__fontspec_main_aliasfontfeature:nn { \bool_set_false:N \l__fontspec_alias_bool @@ -857,7 +853,7 @@ \bool_if:NF \l__fontspec_alias_bool { \__fontspec_warning:nx {rename-feature-not-exist} {#1} } } -\cs_set:Nn \__fontspec_main_aliasfontfeatureoption:nnn +\cs_new:Nn \__fontspec_main_aliasfontfeatureoption:nnn { \bool_set_false:N \l__fontspec_alias_bool @@ -886,13 +882,13 @@ \bool_if:NF \l__fontspec_alias_bool { \__fontspec_warning:nx {rename-feature-not-exist} {#1/#2} } } -\cs_set:Nn \__fontspec_main_DeclareFontsExtensions:n +\cs_new:Nn \__fontspec_main_DeclareFontsExtensions:n { \clist_set:Nn \l__fontspec_extensions_clist { #1 } \tl_remove_all:Nn \l__fontspec_extensions_clist {~} } \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont} -\cs_set:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn +\cs_new:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn { \__fontspec_if_font_feature:nTF {#1} {#2} {#3} } @@ -1252,13 +1248,13 @@ { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } {} } {\f@size pt} \l_fontspec_font % this is necessary for LuaLaTeX to check the scripts properly } -\cs_set:Nn \__fontspec_construct_font_call:nnnnnn +\cs_new:Nn \__fontspec_construct_font_call:nnnnnn { " \__fontspec_fontname_wrap:n { #1 #2 #3 } #4 #5 \str_if_eq_x:nnF {#6}{} {:#6} " } -\cs_set:Nn \__fontspec_construct_font_call:nn +\cs_new:Nn \__fontspec_construct_font_call:nn { \__fontspec_construct_font_call:nnnnnn {#1} @@ -1306,7 +1302,7 @@ } } } -\cs_set:Nn \__fontspec_get_features:Nn +\cs_new:Nn \__fontspec_get_features:Nn { \__fontspec_init_fontface: \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2} @@ -1425,7 +1421,7 @@ \fontspec_complete_fontname:Nn \l__fontspec_curr_fontname_tl {#3} \__fontspec_make_font_shapes:Nnnnn \l__fontspec_curr_fontname_tl {#1} {#2} {#4} {#5} } -\cs_set:Nn \fontspec_complete_fontname:Nn +\cs_new:Nn \fontspec_complete_fontname:Nn { \tl_set:Nx #1 {#2} \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl} @@ -1657,11 +1653,11 @@ } } } -\cs_set:Nn \__fontspec_make_ot_smallcaps:TF +\cs_new:Nn \__fontspec_make_ot_smallcaps:TF { \__fontspec_check_ot_feat:NnTF \l_fontspec_font {smcp} {#1} {#2} } -\cs_set:Nn \__fontspec_make_smallcaps:TF +\cs_new:Nn \__fontspec_make_smallcaps:TF { \bool_if:NTF \l__fontspec_ot_bool { \__fontspec_make_ot_smallcaps:TF {#1} {#2} } @@ -1709,7 +1705,7 @@ \tl_clear:N \l__fontspec_wordspace_adjust_tl \tl_clear:N \l__fontspec_punctspace_adjust_tl } -\cs_set:Nn \__fontspec_iv_str_to_num:Nn +\cs_new:Nn \__fontspec_iv_str_to_num:Nn { \__fontspec_strip_leading_sign:Nw #1#2 \q_nil } @@ -3717,7 +3713,7 @@ { \bool_set_false:N \g__fontspec_pkg_euler_loaded_bool } -\cs_set:Nn \fontspec_setup_maths: +\cs_new:Nn \fontspec_setup_maths: { \@ifpackageloaded{euler} { diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index 5b7d7fc5ad3..0ec857e73ae 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua @@ -22,12 +22,12 @@ fontspec = fontspec or {} local fontspec = fontspec fontspec.module = { name = "fontspec", - version = "2.6f", - date = "2017/11/05", + version = "2.6g", + date = "2017/11/09", description = "Font selection for XeLaTeX and LuaLaTeX", author = "Khaled Hosny, Philipp Gesang, Will Robertson", copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", - license = "LPPL" + license = "LPPL v1.3c" } -- ^^A%% fontspec-lua.dtx -- part of FONTSPEC <wspr.io/fontspec> diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index d9e3a39a20f..fe459cdbf27 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty @@ -20,18 +20,25 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec}% - {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX} + {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> \sys_if_engine_luatex:T - { \RequirePackage{luaotfload} + { + \RequirePackage{luaotfload} \directlua{require("fontspec")} - \RequirePackageWithOptions{fontspec-luatex} \endinput } + \RequirePackageWithOptions{fontspec-luatex} + \endinput + } \sys_if_engine_xetex:T - { \RequirePackageWithOptions{fontspec-xetex} \endinput } + { + \RequirePackageWithOptions{fontspec-xetex} + \endinput + } \msg_new:nnn {fontspec} {cannot-use-pdftex} - { - The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\ - You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ "xelatex"~ or~ "lualatex" instead~ of~ plain~ "latex"~ or~ "pdflatex". - } + { + The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\ + You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ + "xelatex"~ or~ "lualatex" instead~ of~ "latex"~ or~ "pdflatex". + } \msg_fatal:nn {fontspec} {cannot-use-pdftex} |