diff options
author | Karl Berry <karl@freefriends.org> | 2013-10-16 00:07:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-10-16 00:07:19 +0000 |
commit | 0e1db9a175dc6e40e5975bd72684d0caf449ed3a (patch) | |
tree | 27dad53d20f8138dfecd38c77a49d54eceaca1c0 /Master/texmf-dist | |
parent | 5c9c1f5138b68b20bb4715a6f7bd398bd3a652e6 (diff) |
newtx (15oct13)
git-svn-id: svn://tug.org/texlive/trunk@31911 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
25 files changed, 159 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index ef0988cc1f5..b2e3c97914f 100644 --- a/Master/texmf-dist/doc/fonts/newtx/README +++ b/Master/texmf-dist/doc/fonts/newtx/README @@ -1,9 +1,12 @@ This package, based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen. -Current version: 1.141 +Current version: 1.15 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. +Changes in version 1.15 +Added minlibertine fonts and modified newtxmath.sty to improve behavior under XeLaTeX and LuaLaTeX. + Changes in version 1.141 Corrected two errors in definitions of math delimiters <,> under bigdelims option. diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf Binary files differindex 95376942858..497feb442a7 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex index b97d8a377d9..3a83992f858 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex @@ -117,6 +117,60 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \end{verbatim} \textbf{Caution:} In encodings {\tt T1} and {\tt LY1}, the macro \verb|\mathrm| does not produce what you might expect for Greek letters, due to the difference between those encodings and {\tt OT1}. But what were you expecting with \verb|\mathrm{Gamma}| anyway? In {\tt T1} and {\tt LY1}, you'll get a math accent. + +\section{Usage with Lua\LaTeX\ and Xe\LaTeX} +As far as I can tell, \textsf{newtxmath} works with both, but requires a very specific loading order and choice of options. Briefly, except for {\tt libertine} text, the math options must all be loaded prior to loading and using {\tt fontspec}. Be aware that some text packages (eg, {\tt cabin}) may contain a line like +\begin{verbatim} +\RequirePackage{fontspec} +\end{verbatim} +which would prevent (``option clash'' error) a subsequent +\begin{verbatim} +\usepackage[no-math]{fontspec} +\end{verbatim} +unless suppressed by an appropriate option. Eg, +\begin{verbatim} +\usepackage[type1]{cabin} +\end{verbatim} +prevents the problem with the {\tt cabin} package. + +The following examples illustrate some general models, the most unintuitive being the first because it loads a small version, {\tt minlibertine}, of libertine text for use in math mode as numbers, basic symbols and operators. + +\textsc{Example 3:} +\begin{verbatim} +%load text components other than libertine text to be used in math +\usepackage[T1]{fontenc} +\usepackage[scaled=.85]{beramono}% used only by \mathtt +\usepackage[type1]{cabin}% used only by \mathsf +\usepackage{amsmath,amsthm} +\usepackage[libertine,bigdelims]{newtxmath} +% loads minlibertine because no other Roman text package was specified +% so that \mathrm and \mathbf also use minlibertine +\usepackage[scr=rsfso]{mathalfa} +\usepackage{bm}% load after all math to give access to bold math +%Now load the otf text fonts using fontspec---won't affect math +\usepackage[no-math]{fontspec} % process with XeLaTeX or LuaLaTeX +\usepackage{libertine} +\end{verbatim} +The next example is similar, but in math mode, numbers, basic symbols, operator names, \verb|\mathrm| and \verb|\mathbf| will render with {\tt fbb-LF}, though math italic and math Greek letters will be from {\tt libertine}. (Note that one specifies the encoding and redefines \verb|\rmdefault|. For reasons I don't yet understand, it may not work to load the font package---ie, don't substitute \verb|\usepackage{fbb}|, as that will mess up bold in the libertine text package.) + +\textsc{Example 4:} +\begin{verbatim} +%load text components other than libertine text to be used in math +\usepackage[T1]{fontenc} +\renewcommand{\rmdefault}{fbb-LF}% Roman font for use in math mode +\usepackage[scaled=.85]{beramono}% used only by \mathtt +\usepackage[type1]{cabin}% used only by \mathsf +\usepackage{amsmath,amsthm} +\usepackage[libertine,cmintegrals,bigdelims,vvarbb]{newtxmath} +% does not load minlibertine because another Roman text package was specified +\usepackage[scr=rsfso]{mathalfa} +\usepackage{bm}% load after all math to give access to bold math +%Now load the otf text fonts using fontspec---won't affect math +\usepackage[no-math]{fontspec} % process with XeLaTeX or LuaLaTeX +\usepackage{libertine} +\end{verbatim} + + \section{Alternate forms of glyphs} Several math glyphs have alternate forms: \begin{center} @@ -137,7 +191,7 @@ To use an alternate form throughout your document without changing all occurrenc \let\forall\forallAlt \end{verbatim} \section{Conformity with amsmath} -The {\tt newtxmath} package now contains a \verb|\RequirePackage{amsmath}|, as it uses a number of the macros defined there. To pass options to {tt amsmath}, you can pass the options as options to \verb|\documentclass|. For example, +The {\tt newtxmath} package now contains a \verb|\RequirePackage{amsmath}|, as it uses a number of the macros defined there. To pass options to {\tt amsmath}, you can pass the options as options to \verb|\documentclass|. For example, \begin{verbatim} \documentclass[11pt,intlimits]{article} \usepackage{newtxtext} diff --git a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map index 5b61ddd43dc..75dae13eb84 100644 --- a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map +++ b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map @@ -90,3 +90,15 @@ txex-bar txex-bar <txex-bar.pfb txbex-bar txbex-bar <txbex-bar.pfb ntxsyralt ntxsyralt " ntxmiaaltEncoding ReEncodeFont " <[ntxmiaalt.enc <ntxsyralt.pfb ntxsybalt ntxsybalt " ntxmiaaltEncoding ReEncodeFont " <[ntxmiaalt.enc <ntxsybalt.pfb +MinLibIta-ly1 MinLibIta " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibIta +MinLibBolIta-ly1 MinLibBolIta " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibBolIta +MinLibReg-ly1 MinLibReg " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibReg +MinLibBol-ly1 MinLibBol " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibBol +MinLibIta-t1 MinLibIta " ECEncoding ReEncodeFont " <[ec.enc <MinLibIta +MinLibBolIta-t1 MinLibBolIta " ECEncoding ReEncodeFont " <[ec.enc <MinLibBolIta +MinLibReg-t1 MinLibReg " ECEncoding ReEncodeFont " <[ec.enc <MinLibReg +MinLibBol-t1 MinLibBol " ECEncoding ReEncodeFont " <[ec.enc <MinLibBol +MinLibIta-ot1 MinLibIta " LCDF7TEncoding ReEncodeFont " <[7t.enc <MinLibIta +MinLibBolIta-ot1 MinLibBolIta " LCDF7TEncoding ReEncodeFont " <[7t.enc <MinLibBolIta +MinLibReg-ot1 MinLibReg " LCDF7TEncoding ReEncodeFont " <[7t.enc <MinLibReg +MinLibBol-ot1 MinLibBol " LCDF7TEncoding ReEncodeFont " <[7t.enc <MinLibBol diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-ly1.tfm Binary files differnew file mode 100644 index 00000000000..fe5108b26e7 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-ot1.tfm Binary files differnew file mode 100644 index 00000000000..55b1201bb7a --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-t1.tfm Binary files differnew file mode 100644 index 00000000000..f5713c80c3b --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBol-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-ly1.tfm Binary files differnew file mode 100644 index 00000000000..9839df9dd1d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-ot1.tfm Binary files differnew file mode 100644 index 00000000000..c1850a922f3 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-t1.tfm Binary files differnew file mode 100644 index 00000000000..b1d63b1f271 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibBolIta-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-ly1.tfm Binary files differnew file mode 100644 index 00000000000..735714379d9 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-ot1.tfm Binary files differnew file mode 100644 index 00000000000..142c3802e50 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-t1.tfm Binary files differnew file mode 100644 index 00000000000..54264fc5af2 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibIta-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-ly1.tfm Binary files differnew file mode 100644 index 00000000000..43a2cf90f4d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-ot1.tfm Binary files differnew file mode 100644 index 00000000000..c9e6d9455fa --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-t1.tfm Binary files differnew file mode 100644 index 00000000000..fc4eed1428e --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/MinLibReg-t1.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newtx/MinLibBol.pfb b/Master/texmf-dist/fonts/type1/public/newtx/MinLibBol.pfb Binary files differnew file mode 100644 index 00000000000..670872e478b --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newtx/MinLibBol.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/MinLibBolIta.pfb b/Master/texmf-dist/fonts/type1/public/newtx/MinLibBolIta.pfb Binary files differnew file mode 100644 index 00000000000..6039ec3b5f8 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newtx/MinLibBolIta.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/MinLibIta.pfb b/Master/texmf-dist/fonts/type1/public/newtx/MinLibIta.pfb Binary files differnew file mode 100644 index 00000000000..1442b18a23a --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newtx/MinLibIta.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/MinLibReg.pfb b/Master/texmf-dist/fonts/type1/public/newtx/MinLibReg.pfb Binary files differnew file mode 100644 index 00000000000..9d001c42a5b --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newtx/MinLibReg.pfb diff --git a/Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd b/Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd new file mode 100644 index 00000000000..3b65577a19c --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd @@ -0,0 +1,20 @@ +\ProvidesFile{ly1minlibertine.fd}[2013/10/12 v1.0] +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty% +\fi + + \DeclareFontFamily{LY1}{minlibertine}{} + \DeclareFontShape{LY1}{minlibertine}{m}{n}{ + <-> \ntxmath@scaled MinLibReg-ly1 + }{} + \DeclareFontShape{LY1}{minlibertine}{b}{n}{ + <-> \ntxmath@scaled MinLibBol-ly1 + }{} + \DeclareFontShape{LY1}{minlibertine}{m}{it}{ + <-> \ntxmath@scaled MinLibIta-ly1 + }{} + \DeclareFontShape{LY1}{minlibertine}{b}{it}{ + <-> \ntxmath@scaled MinLibBolIta-ly1 + }{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 6ce308f8c9b..d68a351d058 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty @@ -10,8 +10,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.141} -\def\filedate{2013/09/30} +\def\fileversion{1.15} +\def\filedate{2013/10/12} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -21,9 +21,18 @@ \csname newtxmathLoaded\endcsname \let\newtxmathLoaded\endinput \RequirePackage{amsmath} % improves extendable delimiter handling +\RequirePackage{ifxetex,ifluatex,xkeyval} + +\newif\ifxl@otf \xl@otffalse +\ifxetex + \xl@otftrue +\else\ifluatex + \xl@otftrue + \fi +\fi +\newcommand{\cmr@default}{cmr} \input{binhex} -\RequirePackage{xkeyval} \let\ntxmath@scaled\@empty \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} \DeclareOption*{% @@ -69,29 +78,30 @@ amssymbols,uprightGreek} % altnu and largelibfigs valid only with libertine \iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\fi % Use existing text fonts for operators, mathrm, etc -\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n} -\iftx@libertine - \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{sb}{n} -\else - \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n} +\ifxl@otf + \iftx@libertine + \ifx\rmdefault\cmr@default + \renewcommand{\rmdefault}{minlibertine}% since can't load libertine twice + \fi + \fi \fi +\edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi} +\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n} +\SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{n} + \def\operator@font{\mathgroup\symoperators} +\DeclareSymbolFontAlphabet{\mathrm}{operators} + \DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n} \DeclareMathAlphabet{\mathit}{\encodingdefault}{\rmdefault}{m}{it} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} -\iftx@libertine - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{sb}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{sb}{it} -\else - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{b}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{b}{it} -\fi +\DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{\bold@wt}{n} +\SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{it} \SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{b}{n} \SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n} - %%%%%%%%%%%%%%% % Math Italic % %%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 3ee2b63f939..5fdbb31aaf5 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -13,8 +13,8 @@ % Added scaled keyword and osf option; % Modified the definition of \k to bypass problem with grouping; -\def\fileversion{1.141} -\def\filedate{2013/09/30} +\def\fileversion{1.15} +\def\filedate{2013/10/12} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd b/Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd new file mode 100644 index 00000000000..331ffc93ebb --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd @@ -0,0 +1,20 @@ +\ProvidesFile{ot1minlibertine.fd}[2013/10/12 v1.0] +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty% +\fi + + \DeclareFontFamily{OT1}{minlibertine}{} + \DeclareFontShape{OT1}{minlibertine}{m}{n}{ + <-> \ntxmath@scaled MinLibReg-ot1 + }{} + \DeclareFontShape{OT1}{minlibertine}{b}{n}{ + <-> \ntxmath@scaled MinLibBol-ot1 + }{} + \DeclareFontShape{OT1}{minlibertine}{m}{it}{ + <-> \ntxmath@scaled MinLibIta-ot1 + }{} + \DeclareFontShape{OT1}{minlibertine}{b}{it}{ + <-> \ntxmath@scaled MinLibBolIta-ot1 + }{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd b/Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd new file mode 100644 index 00000000000..b98ae5431f5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd @@ -0,0 +1,20 @@ +\ProvidesFile{t1minlibertine.fd}[2013/10/12 v1.0] +\expandafter\ifx\csname ntxmath@scaled\endcsname\relax + \let\ntxmath@scaled\@empty% +\fi + + \DeclareFontFamily{T1}{minlibertine}{} + \DeclareFontShape{T1}{minlibertine}{m}{n}{ + <-> \ntxmath@scaled MinLibReg-t1 + }{} + \DeclareFontShape{T1}{minlibertine}{b}{n}{ + <-> \ntxmath@scaled MinLibBol-t1 + }{} + \DeclareFontShape{T1}{minlibertine}{m}{it}{ + <-> \ntxmath@scaled MinLibIta-t1 + }{} + \DeclareFontShape{T1}{minlibertine}{b}{it}{ + <-> \ntxmath@scaled MinLibBolIta-t1 + }{} + +\endinput |