diff options
44 files changed, 319 insertions, 119 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index fade8bda45f..f34d2ec23d7 100644 --- a/Master/texmf-dist/doc/fonts/newtx/README +++ b/Master/texmf-dist/doc/fonts/newtx/README @@ -1,9 +1,21 @@ 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.042 +Current version: 1.05 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.05: +A number of the changes here were due to valued feedback from Volodya Shavrukov. + +0. As of this version, it is required that you install libertine-type1, which serves as a replacement for libertine-legacy. Note too that the map file name has changed to newtx.map from ntx.map. +1. Fixed some remaining references to libertine-legacy fonts so they point now to the included fonts. +2. Added a new option largelibfigs to [libertine]{newtxmath}, changing the figures used in math mode from the default Libertine figures, which are about 8% shorter than Libertine's CapHeight, to Libertine .cap figures, which are exactly match Libertine CapHeight. (The .cap figures in semibold weight required for math bold were created to match the regular style.) +3. The included fonts zxlr.pfb and zxlz.pfb (used only for math) were updated to include .cap figures. +4. Additional metric changes in ntxmi, ntxmi1 and ntxmia. +5. New OMS symbol virtual fonts tailored for used with the libertine option in newtxmath. +6. Corrected a number of scaling issues due to incorrect macros. +7. Added a new macro \equalht to newtxmath.sty. Applicable only within libertine, with largelibfigs options, making argument set digits and letters to same height. + Change in version 1.042: 1. Changed name libertine-nu.tfm to Libertine-nu.tfm, as it always should have been. @@ -13,7 +25,7 @@ Changes in version 1.041: Changes in version 1.04: 1. Adds separate stripped down versions of the Libertine-Legacy fonts (just the parts used in math) so that it is not necessary to install the now obsolete Libertine-legacy package. (The package libertine.sty now points to libertine-type1, its replacement.) 2. Adds a more distinctive nu, activated with the altnu option. -3. The 7pt and 5pt versions of libertine math have been overhauled and are more spread out than former versions. Upright numberss have been added to the math fonts for better rendering in scriptstyle and scriptscriptstyle and more adjustable spacing. +3. The 7pt and 5pt versions of libertine math have been overhauled and are more spread out than former versions. Upright numbers have been added to the math fonts for better rendering in scriptstyle and scriptscriptstyle and more adjustable spacing. 4. Because there are a great many changes in this version, the chance of error is rather high, but the basic functionality is there for the libertine option. 5. IMPORTANT NOTE for TeX Live users: the name of the main map file for this package has been changed to newtx.map from ntx.map. Make sure that there is no copy of the latter in your texmf trees. If you write diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf Binary files differindex 9605afd41bb..da5bf896f67 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 fce1173a64f..50c08ed0b2d 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex @@ -1,20 +1,24 @@ +% !TEX TS-program = pdflatexmk \documentclass[11pt]{article} \usepackage[margin=1in]{geometry} -\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent +\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent \usepackage{graphicx} \usepackage{url} %SetFonts % libertine text and newtxmath -\usepackage{libertine} -\usepackage[TS1,T1]{fontenc} +\usepackage{lmodern} +\usepackage[lining,semibold]{libertine-type1} +\usepackage[T1]{fontenc} \usepackage{textcomp} \usepackage[scaled=.85]{beramono} \usepackage{amsmath,amsthm} \usepackage[libertine]{newtxmath} -%\usepackage[bb=boondox,frak=boondox,scr=rsfso]{mathalfa} \usepackage{bm} -\renewcommand*{\rmdefault}{fxlj} %old-style figures in text, not math -\def\libertine{\fontfamily{fxlj}\selectfont} +\renewcommand* + {\rmdefault} + {LinuxLibertineO-OsF} +%\renewcommand*{\rmdefault}{zxlj} %old-style figures in text, not math +%\def\libertine{\fontfamily{zxlj}\selectfont} %SetFonts \usepackage{booktabs}\title{New TX font package} \author{Michael Sharpe} @@ -82,8 +86,11 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \item The \textsf{newtxmath} package contains three different Blackboard Bold alphabets, where original \textsf{txfonts} contained two. The default, triggered by \verb|\mathbb{}|, takes its glyphs from the font which replaces {\tt msbm} and has the same overall appearance of a hollowed-out text font, which I find neither bold nor blackboard-like. The second option, taken from \textsf{txfonts}, is triggered by \verb|\varmathbb{}|, is more geometric and, in my opinion, preferable but not optimal. The option {\tt varbb} makes \verb|\mathbb{}| synonymous with \verb|\varmathbb{}|. The third option is the double-struck glyphs from the STIX collection. See the expanded discussion below. \item {\tt nosymbolsc} causes the package to not load the {\tt symbolsC} fonts, saving a math family. (This font contains mostly exotic symbols, along with some very useful, commonly used symbols like \verb|\coloneq| $\coloneq$, \verb|\eqcolon| $\eqcolon$, \verb|\notin| $\notin$, \verb|\notni| $\notni$, \verb|\neq| $\neq$, \verb|\nsubset| $\nsubset$ and \verb|\nsupset| $\nsupset$, but these have been moved (virtually) to {\tt lettersA} so they may continue to be used even if you use the option {\tt nosymbolsc}.) \item {\tt amssymbols} (the default) and {\tt noamssymbols} determine whether the {\tt txfonts} versions of the \textsc{ams} symbols ({\tt msam}, {\tt msbm}) are loaded---if so, they override previous settings in {\tt amsmath}. If you use the option {\tt noamssymbols}, then \verb|\mathbb{}| is set to mean the same as \verb|\varmathbb{}|. (One advantage of {\tt noamssymbols} is that you save two of your precious math families for other purposes, such as setting a couple of external math alphabets by means of the \textsf{mathalfa} package.) -\item {\tt libaltvw} has effect only if the libertine option is selected---in this case, it substitutes for math italic v and w hand-crafted versions based on the Liberine upsilon glyphs. +\item {\tt libaltvw} has effect only if the libertine option is selected---in this case, it substitutes for math italic v and w hand-crafted versions based on the Libertine upsilon glyphs. +\item {largelibfigs} has effect only if the libertine option is selected---with this option, full-sized figures are substituted in math mode for the default Libertine figures, which are about 8\% below Libertine's Capheight. \end{itemize} +\textbf{IMPORTANT:} The Libertine text package is now {\tt libertine-type1}, which requires arguments that are different from the original libertine package. + \textsc{Example 1:} \begin{verbatim} \usepackage{newtxtext} % T1, lining figures so math uses lf @@ -95,17 +102,16 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \end{verbatim} \textsc{Example 2:} \begin{verbatim} -\usepackage[nf]{libertine} % a bit lighter than Times--no osf in math -\usepackage[T1]{fontenc} %the only LaTeX encoding that works with libertine +\usepackage[lining,semibold]{libertine-type1} % a bit lighter than Times--no osf in math +\usepackage[T1]{fontenc} % best for Western European languages \usepackage{textcomp} % required to get special symbols -\renewcommand{\bfdefault}{z} % libertine package uses z, not sb, for semibold \usepackage[scaled=.85]{beramono}% a typewriter font must be defined \usepackage{amsmath,amsthm} \usepackage[libertine,cmintegrals,cmbraces,vvmathbb]{newtxmath} \usepackage[scr=rsfso]{mathalfa} \usepackage{bm}% load after all math to give access to bold math -\renewcommand*{\rmdefault}{fxlj} %old-style figures in text, not math -\def\libertine{\fontfamily{fxlj}\selectfont} +\renewcommand*{\rmdefault}{LinuxLibertineO-OsF} %old-style figures in text, not math +% use TOsF for tabular figures rather than proportional \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. @@ -172,7 +178,7 @@ The text glyphs dotlessi (\verb|\i|) and dotlessj (\verb|\j|) are rarely needed \hline \end{tabular} \end{center} -\newcommand{\xyvec}[2]{\ensuremath{#1\bm{\textbf{\i}}#2\bm{\textbf{\j}}}} +\newcommand{\xyvec}[2]{\ensuremath{#1\mkern1.5mu\bm{\textbf{\i}}#2\mkern1.5mu\bm{\textbf{\j}}}} In math, bold roman characters are often used to indicate vector quantities, and for this one uses constructions like \begin{itemize} @@ -187,7 +193,8 @@ In math, bold roman characters are often used to indicate vector quantities, and \item \verb|$\bm{\dot{x}}$| produces $\bm{\dot{x}}$ (bold but not roman); \item the macro definition \begin{verbatim} -\newcommand{\xyvec}[2]{\ensuremath{#1\bm{\textbf{\i}}#2\bm{\textbf{\j}}}} +\newcommand{\xyvec}[2]{% +\ensuremath{#1\mkern1.5mu\bm{\textbf{\i}}#2\mkern1.5mu\bm{\textbf{\j}}}} \end{verbatim} allows you to write \verb|\xyvec{x}{+y}| to output $\xyvec{x}{+y}$; \item \verb|$\bm{\Gamma}$| produces $\bm{\Gamma}$ (bold Gamma); @@ -316,7 +323,7 @@ Good match between text and math size and weight, though the summation symbol (f \item infinity symbol not sufficiently large? \item the package lacks a number of amenities that are present in other packages. \end{itemize} -\section{Items installed} As well as a collection of PostScript fonts, virtual fonts, font definition files and the central {\tt newtxtext.sty} and {\tt newtxmath.sty} files, the package contains one map file {\tt ntx.map} that must be enabled for the package to function correctly. The file \texttt{implementation.pdf} in this distribution provides a manifest of all files installed together with a brief indication of the sources. +\section{Items installed} As well as a collection of PostScript fonts, virtual fonts, font definition files and the central {\tt newtxtext.sty} and {\tt newtxmath.sty} files, the package contains one map file {\tt newtx.map} that must be enabled for the package to function correctly. Its name was changed from {\tt ntx.map} to mirror the package name.) The file \texttt{implementation.pdf} in this distribution provides a manifest of all files installed together with a brief indication of the sources. %It is the glue that allows. The two {\tt fxl*.pfb} files to which they refer are part of the Libertine-Legacy collection that is part of \TeX\ Live. The map file {\tt libertine.map} must not have been disabled. The other {\tt.pfb} files are either part of the \textsf{txfonts} or are fonts derived from them or from the \textsf{Computer Modern} fonts in some manner. %\begin{verbatim} diff --git a/Master/texmf-dist/fonts/enc/dvips/newtx/libcaps.enc b/Master/texmf-dist/fonts/enc/dvips/newtx/libcaps.enc new file mode 100644 index 00000000000..5ecf3e17c2e --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/newtx/libcaps.enc @@ -0,0 +1,86 @@ +% File libcaps.enc +% +% Encodes Libertine caps figures which may serve as alternative figures in newtxmath. +/LibCapsEncoding [ +% 0x00 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x10 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x20 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x30 + /zero.cap /one.cap /two.cap /three.cap + /four.cap /five.cap /six.cap /seven.cap + /eight.cap /nine.cap /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x40 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + % 0x50 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x60 +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +% 0x70 +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef +% 0x80 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x90 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xA0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xB0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xC0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xD0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xE0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0xF0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +] def + diff --git a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map index 60eefb3e677..e3fdaea09e4 100644 --- a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map +++ b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map @@ -1,3 +1,5 @@ +zxlz-caps LinLibertineZ " LibCapsEncoding ReEncodeFont " <[libcaps.enc <zxlz.pfb +zxlr-caps LinLibertine " LibCapsEncoding ReEncodeFont " <[libcaps.enc <zxlr.pfb Libertine-nu Libertine-nu <Libertine-nu.pfb LibertineI-nu LibertineI-nu <LibertineI-nu.pfb LibertineZ-nu LibertineZ-nu <LibertineZ-nu.pfb diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi.tfm Binary files differindex 8daf3f3130d..5cc8f0a5a58 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi1.tfm Binary files differindex 6959690e340..fe07873f9ac 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmi1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm Binary files differindex e1de7e52d94..d76a14a4a5c 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi.tfm Binary files differindex 6032d7715e7..ed1e1b9aef1 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm Binary files differindex 60571dae6d9..e206f024c37 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmi1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm Binary files differindex 98d206695bb..ec7f8900177 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm Binary files differindex 09d90d06b5d..51235d2b3b8 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbsy5.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbsy5.tfm Binary files differnew file mode 100644 index 00000000000..38067592623 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbsy5.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlbsy7.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbsy7.tfm Binary files differnew file mode 100644 index 00000000000..38067592623 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlbsy7.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm Binary files differindex 9170ead18dd..4f5149beb1c 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlsy5.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlsy5.tfm Binary files differnew file mode 100644 index 00000000000..5d85414ef31 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlsy5.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/nxlsy7.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlsy7.tfm Binary files differnew file mode 100644 index 00000000000..5d85414ef31 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/nxlsy7.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/zxlr-caps.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/zxlr-caps.tfm Binary files differnew file mode 100644 index 00000000000..1e6f29b1f07 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/zxlr-caps.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/zxlz-caps.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/zxlz-caps.tfm Binary files differnew file mode 100644 index 00000000000..aa3f11744a3 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/zxlz-caps.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newtx/zxlr.pfb b/Master/texmf-dist/fonts/type1/public/newtx/zxlr.pfb Binary files differindex b237ea0413b..fc0d663aaee 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/zxlr.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/zxlr.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/zxlz.pfb b/Master/texmf-dist/fonts/type1/public/newtx/zxlz.pfb Binary files differindex e7fce41cd9c..bc6cc78261e 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/zxlz.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/zxlz.pfb diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi.vf Binary files differindex b6ee8389096..42708cd837a 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi1.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi1.vf Binary files differindex d2be61c615a..f1f97aa383e 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi1.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmi1.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxmi.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxmi.vf Binary files differindex 979431d4a12..e6e53e04013 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxmi.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxmi.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf Binary files differindex 2998b2307d1..34bf66fccb5 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlbmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlbsy5.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlbsy5.vf Binary files differnew file mode 100644 index 00000000000..e89ffeabcd7 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlbsy5.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlbsy7.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlbsy7.vf Binary files differnew file mode 100644 index 00000000000..e89ffeabcd7 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlbsy7.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf Binary files differindex a9d0f665e1a..ff99dcdc048 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlsy5.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlsy5.vf Binary files differnew file mode 100644 index 00000000000..da0e77f2490 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlsy5.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/nxlsy7.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlsy7.vf Binary files differnew file mode 100644 index 00000000000..da0e77f2490 --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/newtx/nxlsy7.vf diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index c34291a2887..6a38ec837c4 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.04} -\def\filedate{2012/09/27} +\def\fileversion{1.05} +\def\filedate{2012/11/10} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -30,10 +30,12 @@ \noexpand\setkeys{ntxmath}{\CurrentOption}}% \x} \DeclareOption{varg}{\def\X@s@v@rg{}} +\newcount\tx@Isdigit \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces \newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC \tx@symbolsCtrue \newif\iftx@altnu +\newif\iftx@largelibfigs \newif\iftx@minion \newif\iftx@libaltvw \DeclareOption{varbb}{\tx@varbbtrue} \DeclareOption{vvarbb}{\tx@vvarbbtrue} @@ -48,18 +50,20 @@ \DeclareOption{uprightGreek}{\tx@slantedGfalse} \DeclareOption{slantedGreek}{\tx@slantedGtrue} \DeclareOption{altnu}{\tx@altnutrue} +\DeclareOption{largelibfigs}{\tx@largelibfigstrue} \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* + % No varg option with option libertine or option minion \iftx@libertine\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi \iftx@minion\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi -% altnu valid only with libertine -\iftx@libertine\else\tx@altnufalse\fi +% 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}{z}{n} + \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{sb}{n} \else \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n} \fi @@ -70,8 +74,8 @@ amssymbols,uprightGreek} \DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n} \DeclareSymbolFontAlphabet{\mathrm}{operators} \iftx@libertine - \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{z}{n} - \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{z}{it} + \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} @@ -194,6 +198,23 @@ amssymbols,uprightGreek} \DeclareMathSymbol{#1}{#2}{#3}{#4} \advance #4 by1} +\def\tx@isdigit#1{% #1 should be a single character +\tx@Isdigit=\z@ % +\count0=\number`#1\relax% +\ifnum\count0>47\relax% +\ifnum\count0<58\relax% +\tx@Isdigit=\@ne % +\fi% +\fi% +} + +\def\tx@XXX#1#2\@nil{% #1=first character, #2=rest of string +\tx@isdigit{#1}% +\ifnum\tx@Isdigit>\z@ $#1$\else#1\fi% +\if\relax\detokenize{#2}\relax \else +\edef\tx@XXXcmd{\noexpand\tx@XXX #2\noexpand\@nil}\tx@XXXcmd \fi} + +\def\equalht#1{\tx@XXX #1\@nil} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1252,16 +1273,50 @@ amssymbols,uprightGreek} \mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\braceru$} \iftx@libertine% - \DeclareMathSymbol{0}{\mathalpha}{letters}{48} - \DeclareMathSymbol{1}{\mathalpha}{letters}{49} - \DeclareMathSymbol{2}{\mathalpha}{letters}{50} - \DeclareMathSymbol{3}{\mathalpha}{letters}{51} - \DeclareMathSymbol{4}{\mathalpha}{letters}{52} - \DeclareMathSymbol{5}{\mathalpha}{letters}{53} - \DeclareMathSymbol{6}{\mathalpha}{letters}{54} - \DeclareMathSymbol{7}{\mathalpha}{letters}{55} - \DeclareMathSymbol{8}{\mathalpha}{letters}{56} - \DeclareMathSymbol{9}{\mathalpha}{letters}{57} + \iftx@largelibfigs% + \DeclareMathSymbol{0}{\mathalpha}{lettersA}{155} + \DeclareMathSymbol{1}{\mathalpha}{lettersA}{156} + \DeclareMathSymbol{2}{\mathalpha}{lettersA}{157} + \DeclareMathSymbol{3}{\mathalpha}{lettersA}{158} + \DeclareMathSymbol{4}{\mathalpha}{lettersA}{159} + \DeclareMathSymbol{5}{\mathalpha}{lettersA}{160} + \DeclareMathSymbol{6}{\mathalpha}{lettersA}{161} + \DeclareMathSymbol{7}{\mathalpha}{lettersA}{162} + \DeclareMathSymbol{8}{\mathalpha}{lettersA}{163} + \DeclareMathSymbol{9}{\mathalpha}{lettersA}{164} + \else + \DeclareMathSymbol{0}{\mathalpha}{letters}{48} + \DeclareMathSymbol{1}{\mathalpha}{letters}{49} + \DeclareMathSymbol{2}{\mathalpha}{letters}{50} + \DeclareMathSymbol{3}{\mathalpha}{letters}{51} + \DeclareMathSymbol{4}{\mathalpha}{letters}{52} + \DeclareMathSymbol{5}{\mathalpha}{letters}{53} + \DeclareMathSymbol{6}{\mathalpha}{letters}{54} + \DeclareMathSymbol{7}{\mathalpha}{letters}{55} + \DeclareMathSymbol{8}{\mathalpha}{letters}{56} + \DeclareMathSymbol{9}{\mathalpha}{letters}{57} + \fi + \DeclareMathSymbol{\Libzero}{\mathord}{lettersA}{155} + \DeclareMathSymbol{\Libone}{\mathalpha}{lettersA}{156} + \DeclareMathSymbol{\Libtwo}{\mathalpha}{lettersA}{157} + \DeclareMathSymbol{\Libthree}{\mathalpha}{lettersA}{158} + \DeclareMathSymbol{\Libfour}{\mathalpha}{lettersA}{159} + \DeclareMathSymbol{\Libfive}{\mathalpha}{lettersA}{160} + \DeclareMathSymbol{\Libsix}{\mathalpha}{lettersA}{161} + \DeclareMathSymbol{\Libseven}{\mathalpha}{lettersA}{162} + \DeclareMathSymbol{\Libeight}{\mathalpha}{lettersA}{163} + \DeclareMathSymbol{\Libnine}{\mathalpha}{lettersA}{164} +% + \DeclareMathSymbol{\libzero}{\mathalpha}{letters}{48} + \DeclareMathSymbol{\libone}{\mathalpha}{letters}{49} + \DeclareMathSymbol{\libtwo}{\mathalpha}{letters}{50} + \DeclareMathSymbol{\libthree}{\mathalpha}{letters}{51} + \DeclareMathSymbol{\libfour}{\mathalpha}{letters}{52} + \DeclareMathSymbol{\libfive}{\mathalpha}{letters}{53} + \DeclareMathSymbol{\libsix}{\mathalpha}{letters}{54} + \DeclareMathSymbol{\libseven}{\mathalpha}{letters}{55} + \DeclareMathSymbol{\libeight}{\mathalpha}{letters}{56} + \DeclareMathSymbol{\libnine}{\mathalpha}{letters}{57} \fi %%% \not redefined: diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 9ca2877ba35..4c348f4dee4 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.03} -\def\filedate{2012/08/13} +\def\fileversion{1.05} +\def\filedate{2012/11/13} \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/omlntxmi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd index 51f8dffa953..633c7285f4c 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd @@ -7,32 +7,34 @@ [2012/03/22 Fontinst v1.933 font definitions for OML/ntxmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OML}{ntxmi}{\skewchar\font127 } \ifx\X@s@v@rg\undefined \DeclareFontShape{OML}{ntxmi}{m}{it}{ - <-6.3> \ntxmath@scaled ntxmi5 - <6.3-8.6> \ntxmath@scaled ntxmi7 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxmi% + <-6.3> \ntxmath@@scaled ntxmi5 + <6.3-8.6> \ntxmath@@scaled ntxmi7 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxmi% }{} \DeclareFontShape{OML}{ntxmi}{b}{it}{ - <-6.3> \ntxmath@scaled ntxbmi5 - <6.3-8.6> \ntxmath@scaled ntxbmi7 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxbmi% + <-6.3> \ntxmath@@scaled ntxbmi5 + <6.3-8.6> \ntxmath@@scaled ntxbmi7 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxbmi% }{} \else \DeclareFontShape{OML}{ntxmi}{m}{it}{ - <-6.3> \ntxmath@scaled ntxmi15 - <6.3-8.6> \ntxmath@scaled ntxmi17 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxmi1% + <-6.3> \ntxmath@@scaled ntxmi15 + <6.3-8.6> \ntxmath@@scaled ntxmi17 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxmi1% }{} \DeclareFontShape{OML}{ntxmi}{b}{it}{ - <-6.3> \ntxmath@scaled ntxbmi15 - <6.3-8.6> \ntxmath@scaled ntxbmi17 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxbmi1% + <-6.3> \ntxmath@@scaled ntxbmi15 + <6.3-8.6> \ntxmath@@scaled ntxbmi17 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxbmi1% }{} \fi \DeclareFontShape{OML}{ntxmi}{l}{it}{<->ssub * ntxmi/m/it}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd index 3a803cc753d..5fc7b23d757 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd @@ -8,7 +8,9 @@ [2012/05/19 Fontinst v1.933 font definitions for OML/nxlmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OML}{nxlmi}{\skewchar \font =127} @@ -16,53 +18,53 @@ \iftx@libaltvw % new v, w \iftx@altnu % new nu \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi35 - <6.3-8.6> \ntxmath@scaled nxlmi37 - <8.6-> \ntxmath@scaled nxlmi3 + <-6.3> \ntxmath@@scaled nxlmi35 + <6.3-8.6> \ntxmath@@scaled nxlmi37 + <8.6-> \ntxmath@@scaled nxlmi3 }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi35 - <6.3-8.6> \ntxmath@scaled nxlbmi37 - <8.6-> \ntxmath@scaled nxlbmi3 + <-6.3> \ntxmath@@scaled nxlbmi35 + <6.3-8.6> \ntxmath@@scaled nxlbmi37 + <8.6-> \ntxmath@@scaled nxlbmi3 }{} \else % old nu \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi15 - <6.3-8.6> \ntxmath@scaled nxlmi17 - <8.6-> \ntxmath@scaled nxlmi1 + <-6.3> \ntxmath@@scaled nxlmi15 + <6.3-8.6> \ntxmath@@scaled nxlmi17 + <8.6-> \ntxmath@@scaled nxlmi1 }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi15 - <6.3-8.6> \ntxmath@scaled nxlbmi17 - <8.6-> \ntxmath@scaled nxlbmi1 + <-6.3> \ntxmath@@scaled nxlbmi15 + <6.3-8.6> \ntxmath@@scaled nxlbmi17 + <8.6-> \ntxmath@@scaled nxlbmi1 }{} \fi \else % original v, w \iftx@altnu \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi25 - <6.3-8.6> \ntxmath@scaled nxlmi27 - <8.6-> \ntxmath@scaled nxlmi2 + <-6.3> \ntxmath@@scaled nxlmi25 + <6.3-8.6> \ntxmath@@scaled nxlmi27 + <8.6-> \ntxmath@@scaled nxlmi2 }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi25 - <6.3-8.6> \ntxmath@scaled nxlbmi27 - <8.6-> \ntxmath@scaled nxlbmi2 + <-6.3> \ntxmath@@scaled nxlbmi25 + <6.3-8.6> \ntxmath@@scaled nxlbmi27 + <8.6-> \ntxmath@@scaled nxlbmi2 }{} \else \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi5 - <6.3-8.6> \ntxmath@scaled nxlmi7 - <8.6-> \ntxmath@scaled nxlmi + <-6.3> \ntxmath@@scaled nxlmi5 + <6.3-8.6> \ntxmath@@scaled nxlmi7 + <8.6-> \ntxmath@@scaled nxlmi }{} \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi5 - <6.3-8.6> \ntxmath@scaled nxlbmi7 - <8.6-> \ntxmath@scaled nxlbmi + <-6.3> \ntxmath@@scaled nxlbmi5 + <6.3-8.6> \ntxmath@@scaled nxlbmi7 + <8.6-> \ntxmath@@scaled nxlbmi }{} \fi \fi diff --git a/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd b/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd index 6428aeee1b6..223c2e8d2b3 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlzmnmi.fd @@ -8,17 +8,19 @@ [2012/06/23 Fontinst v1.933 font definitions for OML/zmnmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OML}{zmnmi}{\skewchar \font =127} \DeclareFontShape{OML}{zmnmi}{m}{it}{ - <-> \ntxmath@scaled zmnmi + <-> \ntxmath@@scaled zmnmi }{} \DeclareFontShape{OML}{zmnmi}{b}{it}{ - <-> \ntxmath@scaled zmnbmi + <-> \ntxmath@@scaled zmnbmi }{} \DeclareFontShape{OML}{zmnmi}{m}{sl}{<->ssub * zmnmi/m/it}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd index 1c963021199..70179ab9310 100644 --- a/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd +++ b/Master/texmf-dist/tex/latex/newtx/omsntxsy.fd @@ -1,29 +1,45 @@ %Filename: omsntxsy.fd -%Created by: tex sy-drv +%Created by: tex tx-sy-drv %Created using fontinst v1.933 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{omsntxsy.fd} - [2012/04/10 Fontinst v1.933 font definitions for OMS/ntxsy.] + [2012/11/14 Fontinst v1.933 font definitions for OMS/ntxsy.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OMS}{ntxsy}{\skewchar \font =120} -\DeclareFontShape{OMS}{ntxsy}{m}{n}{ - <-6.3> \ntxmath@scaled ntxsy5 - <6.3-8.6> \ntxmath@scaled ntxsy7 % from 6.3 up to, but not including, 8.6 - <8.6-> \ntxmath@scaled ntxsy -}{} - -\DeclareFontShape{OMS}{ntxsy}{b}{n}{ - <-6.3> \ntxmath@scaled ntxbsy5 - <6.3-8.6> \ntxmath@scaled ntxbsy7 - <-> \ntxmath@scaled ntxbsy -}{} +\iftx@libertine + \DeclareFontShape{OMS}{ntxsy}{m}{n}{ + <-6.3> \ntxmath@@scaled nxlsy5 + <6.3-8.6> \ntxmath@@scaled nxlsy7 + <8.6-> \ntxmath@@scaled ntxsy + }{} + + \DeclareFontShape{OMS}{ntxsy}{b}{n}{ + <-6.3> \ntxmath@@scaled nxlbsy5 + <6.3-8.6> \ntxmath@@scaled nxlbsy7 + <8.6-> \ntxmath@@scaled ntxbsy + }{} +\else + \DeclareFontShape{OMS}{ntxsy}{m}{n}{ + <-6.3> \ntxmath@@scaled ntxsy5 + <6.3-8.6> \ntxmath@@scaled ntxsy7 % from 6.3 up to, but not including, 8.6 + <8.6-> \ntxmath@@scaled ntxsy + }{} + + \DeclareFontShape{OMS}{ntxsy}{b}{n}{ + <-6.3> \ntxmath@@scaled ntxbsy5 + <6.3-8.6> \ntxmath@@scaled ntxbsy7 + <8.6-> \ntxmath@@scaled ntxbsy + }{} +\fi \DeclareFontShape{OMS}{ntxsy}{bx}{n}{<->ssub * ntxsy/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omxntxex.fd b/Master/texmf-dist/tex/latex/newtx/omxntxex.fd index 413b59ba21a..b619f508688 100644 --- a/Master/texmf-dist/tex/latex/newtx/omxntxex.fd +++ b/Master/texmf-dist/tex/latex/newtx/omxntxex.fd @@ -8,17 +8,19 @@ [2012/04/18 Fontinst v1.933 font definitions for OMX/ntxex.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OMX}{ntxex}{} \DeclareFontShape{OMX}{ntxex}{m}{n}{ - <-> \ntxmath@scaled ntxex + <-> \ntxmath@@scaled ntxex }{} \DeclareFontShape{OMX}{ntxex}{b}{n}{ - <-> \ntxmath@scaled ntxbex + <-> \ntxmath@@scaled ntxbex }{} \DeclareFontShape{OMX}{ntxex}{bx}{n}{<->ssub * ntxex/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd b/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd index 6a71aef220b..cfdc758052d 100644 --- a/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd +++ b/Master/texmf-dist/tex/latex/newtx/omxntxexv.fd @@ -8,17 +8,19 @@ [2012/04/29 Fontinst v1.933 font definitions for OMX/ntxexv.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{OMX}{ntxexv}{} \DeclareFontShape{OMX}{ntxexv}{m}{n}{ - <-> \ntxmath@scaled ntxexv + <-> \ntxmath@@scaled ntxexv }{} \DeclareFontShape{OMX}{ntxexv}{b}{n}{ - <-> \ntxmath@scaled ntxbexv + <-> \ntxmath@@scaled ntxbexv }{} \DeclareFontShape{OMX}{ntxexv}{bx}{n}{<->ssub * ntxexv/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxexa.fd b/Master/texmf-dist/tex/latex/newtx/untxexa.fd index 27efa97e1a3..cd158fbd43c 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxexa.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxexa.fd @@ -8,17 +8,19 @@ [2012/04/16 Fontinst v1.933 font definitions for U/ntxexa.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxexa}{} \DeclareFontShape{U}{ntxexa}{m}{n}{ - <-> \ntxmath@scaled ntxexa + <-> \ntxmath@@scaled ntxexa }{} \DeclareFontShape{U}{ntxexa}{b}{n}{ - <-> \ntxmath@scaled ntxbexa + <-> \ntxmath@@scaled ntxbexa }{} \DeclareFontShape{U}{ntxexa}{bx}{n}{<->ssub * ntxexa/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd index ab1d2ba1bbf..6ddbf5df909 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd @@ -8,35 +8,37 @@ [2012/04/16 Fontinst v1.933 font definitions for U/ntxmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxmia}{\skewchar \font =127} \iftx@libertine \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled nxlmia + <-> \ntxmath@@scaled nxlmia }{} \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled nxlbmia + <-> \ntxmath@@scaled nxlbmia }{} \else \iftx@minion \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled zmnmia + <-> \ntxmath@@scaled zmnmia }{} \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled zmnbmia + <-> \ntxmath@@scaled zmnbmia }{} \else \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxmia + <-> \ntxmath@@scaled ntxmia }{} \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxbmia + <-> \ntxmath@@scaled ntxbmia }{} \fi \fi diff --git a/Master/texmf-dist/tex/latex/newtx/untxsya.fd b/Master/texmf-dist/tex/latex/newtx/untxsya.fd index 38997f1e611..79e8a73b794 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsya.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsya.fd @@ -8,17 +8,19 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsya.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxsya}{} \DeclareFontShape{U}{ntxsya}{m}{n}{ - <-> \ntxmath@scaled ntxsya + <-> \ntxmath@@scaled ntxsya }{} \DeclareFontShape{U}{ntxsya}{b}{n}{ - <-> \ntxmath@scaled ntxbsya + <-> \ntxmath@@scaled ntxbsya }{} \DeclareFontShape{U}{ntxsya}{bx}{n}{<->ssub * ntxsya/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxsyb.fd b/Master/texmf-dist/tex/latex/newtx/untxsyb.fd index fab9938fc4c..77e8ff311fc 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsyb.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsyb.fd @@ -8,17 +8,19 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsyb.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxsyb}{} \DeclareFontShape{U}{ntxsyb}{m}{n}{ - <-> \ntxmath@scaled ntxsyb + <-> \ntxmath@@scaled ntxsyb }{} \DeclareFontShape{U}{ntxsyb}{b}{n}{ - <-> \ntxmath@scaled ntxbsyb + <-> \ntxmath@@scaled ntxbsyb }{} \DeclareFontShape{U}{ntxsyb}{bx}{n}{<->ssub * ntxsyb/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/untxsyc.fd b/Master/texmf-dist/tex/latex/newtx/untxsyc.fd index 76f4cc9271c..c96d992e8ab 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsyc.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsyc.fd @@ -8,17 +8,19 @@ [2012/04/12 Fontinst v1.933 font definitions for U/ntxsyc.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{ntxsyc}{} \DeclareFontShape{U}{ntxsyc}{m}{n}{ - <-> \ntxmath@scaled ntxsyc + <-> \ntxmath@@scaled ntxsyc }{} \DeclareFontShape{U}{ntxsyc}{b}{n}{ - <-> \ntxmath@scaled ntxbsyc + <-> \ntxmath@@scaled ntxbsyc }{} \DeclareFontShape{U}{ntxsyc}{bx}{n}{<->ssub * ntxsyc/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd b/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd index 5ffaa9358c2..ebc01d14576 100644 --- a/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/uzmnmia.fd @@ -8,17 +8,19 @@ [2012/06/23 Fontinst v1.933 font definitions for U/zmnmia.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \let\ntxmath@@scaled\@empty% +\else + \edef\ntxmath@@scaled{s*[\csname ntxmath@scaled\endcsname]}% \fi \DeclareFontFamily{U}{zmnmia}{\skewchar \font =127} \DeclareFontShape{U}{zmnmia}{m}{it}{ - <-> \ntxmath@scaled zmnmia + <-> \ntxmath@@scaled zmnmia }{} \DeclareFontShape{U}{zmnmia}{b}{it}{ - <-> \ntxmath@scaled zmnbmia + <-> \ntxmath@@scaled zmnbmia }{} \DeclareFontShape{U}{zmnmia}{m}{sl}{<->ssub * zmnmia/m/it}{} |