diff options
Diffstat (limited to 'Master')
28 files changed, 261 insertions, 91 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index 55b220ce7b3..fbdea108761 100644 --- a/Master/texmf-dist/doc/fonts/newtx/README +++ b/Master/texmf-dist/doc/fonts/newtx/README @@ -1,9 +1,15 @@ 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.13 +Current version: 1.14 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.14 +1. Many changes to largesymbols. There is a new option bigdelims which changes the default versions of the delimiters to ones that are bigger at the two smallest sizes, and more distinct. +2. Modified definitions of integrals to conform to amsmath option intlimits. +3. The package amsmath is now required, and is loaded by newtxmath, if necessary. +4. Substantial changes to lettersA, adding a number of new glyphs for the bigdelims option. + Changes in version 1.13 1. Provides alternate versions of some math symbols. See newtxdoc.pdf for details. 2. Corrected behavior of scaled in newtxmath. diff --git a/Master/texmf-dist/doc/fonts/newtx/mathnotes.pdf b/Master/texmf-dist/doc/fonts/newtx/mathnotes.pdf Binary files differnew file mode 100644 index 00000000000..280afd4f046 --- /dev/null +++ b/Master/texmf-dist/doc/fonts/newtx/mathnotes.pdf diff --git a/Master/texmf-dist/doc/fonts/newtx/mathnotes.tex b/Master/texmf-dist/doc/fonts/newtx/mathnotes.tex new file mode 100644 index 00000000000..2a9d37f933b --- /dev/null +++ b/Master/texmf-dist/doc/fonts/newtx/mathnotes.tex @@ -0,0 +1,91 @@ +% !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{graphicx} +\usepackage{url} +%SetFonts +% libertine text and newtxmath +\usepackage{lmodern} +\usepackage[lf,semibold]{libertine} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage[varqu,varl]{zi4} +\usepackage{amsmath,amsthm} +\usepackage[libertine]{newtxmath} +\useosf +\usepackage{bm} +%SetFonts +\usepackage{booktabs} +\title{Math fonts for \texttt{newtx} and \texttt{newpx}} +\author{Michael Sharpe} +\date{\today} % Activate to display a given date or no date + +\begin{document} +\maketitle +\section{Introduction} +This file adds some information updating the information in {\tt implementation.pdf}, showing the relationships between the various forms of math fonts. For simplicity, we discuss only regular weight fonts---there is for each a corresponding bold weight constructed in the same way. Font constructed for use with scriptstyle (7{\tt pt}) and scriptscriptstyle (5{\tt pt}) are also ignored, as their construction was adequately described in {\tt implementation.pdf}. Likewise, we ignore the variant triggered by {\tt varg}, which is indicated by the $1$ appended near the end of the math font name. + +The math fonts used in these packages are of the following families: +\begin{itemize} +\item [operators] (\verb|\fam0|) is a copy of the Roman text font; +\item +[letters] (\verb|\fam1|---OML encoding, 7-bit (128 characters)) containing the math italic Roman and mathematical Greek italic letters, among others; +\item [symbols] (\verb|\fam2|---OMS encoding, 7-bit (128 characters)) containing most common mathematical symbols; +\item [largesymbols] (\verb|\fam3|---sometimes OMX encoding, 7-bit (128 characters), sometimes LMX encoding, 8-bit (256 characters)) containing extensible delimiters and large mathematical symbols; +\item [lettersA] (unencoded 8-bit (256 characters)) with upright Greek, Gothic and assorted symbols; +\item [AMSa] (unencoded 8-bit (256 characters)) with replacements for the AMSA characters; +\item [AMSb] (unencoded 8-bit (256 characters)) with replacements for the AMSB characters; +\item [symbolsC] (unencoded--8-bit (256 characters)) containing less common mathematical symbols; +\item [largesymbolsA] (unencoded--8-bit (256 characters)) containing less common extensible or large mathematical symbols. +\end{itemize} +The options you choose affect only {\tt letters}, {\tt lettersA} and {\tt largesymbols}, and these are the only ones discussed below. + +\textsc{Letters}: +\begin{itemize} +\item {\tt newtx}: +\begin{itemize} +\item The default is Times Roman and Greek italic shapes---{\tt ntxmi}; +\item {\tt minion} uses Roman and Greek italic shapes taken from MinionPro---{\tt zmnmi}; +\item {\tt garamondx} uses Times italic Greek plus Roman italic shapes taken from garamondx---{\tt zgmmi}; +\item {\tt libertine} uses Roman and Greek italic shapes taken from libertine---{\tt nxlmi}. +\end{itemize} +\item {newpx}: +\begin{itemize} +\item The default is Palatino (clone) Roman and Greek italic shapes---{\tt npxmi}; +\end{itemize} +\end{itemize} + +\textsc{LettersA}:\\ +Among other unique glyphs, this also contains variant forms for other characters such as small delimiters. +\begin{itemize} +\item {\tt newtx}: +\begin{itemize} +\item The default is Times Greek upright shapes---{\tt ntxmia}; +\item {\tt minion} substitutes Greek upright shapes taken from MinionPro---{\tt zmnmia}; +\item {\tt libertine} substitutes Greek upright shapes taken from libertine---{\tt nxlmia}. +\end{itemize} +\item {\tt newpx}: +\begin{itemize} +\item The default is Palatino (clone) Greek upright shapes---{\tt npxmia}; +\end{itemize} +\end{itemize} + +\textsc{Largesymbols}:\\ +The glyphs don't depend on the font options but do on the option {\tt bigdelims}. OMX encoding is not used for this family, in favor of an LMX-(un)encoded 8-bit math extension. +\begin{itemize} + +\item {\tt newtx}: +\begin{itemize} +\item The LMX-(un)encoded 8-bit math extension brings in new glyphs mainly from {\tt txex-bar}, {\tt ntxexb} and {\tt ntxsyralt}, and goes by the name {\tt ntxexx}. +\end{itemize} +\item {\tt newpx}: +\begin{itemize} +\item The LMX-(un)encoded 8-bit math extension goes by the name {\tt npxexx}, constructed by scaling up {\tt ntxexx}. +\end{itemize} +\end{itemize} + + + + +\end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf Binary files differindex 62c5daa6ad7..95376942858 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 844f24d599e..b97d8a377d9 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex @@ -13,13 +13,10 @@ \usepackage[varqu,varl]{zi4} \usepackage{amsmath,amsthm} \usepackage[libertine]{newtxmath} -\makeatletter -\def\libertine@figurestyle{OsF} %old-style figures in text, not math -\makeatother -\renewcommand*{\rmdefault}{LinuxLibertineT-OsF} -\usepackage{bm} +\useosf\usepackage{bm} %SetFonts -\usepackage{booktabs}\title{New TX font package} +\usepackage{booktabs} +\title{New TX font package} \author{Michael Sharpe} \date{\today} % Activate to display a given date or no date @@ -28,7 +25,7 @@ \section{Introduction} The {\tt txfonts} package by Young Ryu has been available for over ten years but has been corrected very little since its introduction. It is meant to be a complete text and math package with roman text font provided by Times or a Times clone, sans serif based on a \textsf{Helvetica} clone, typewriter faces, plus math symbol fonts whose math italic letters are from a Times Italic clone. The additional glyphs, whether taken from free sources or designed by him, are generally of high quality, but the accompanying metrics are not, making the math inconsistently spaced, but at times so cramped that neighboring symbols collide. -The goal of this new project is use his glyphs along with a few additions and with completely reworked metrics which are generally looser, but not as loose as Computer Modern math, to make a math package that works with not only Times, but also with fonts that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. +The goal of this new project is use his glyphs along with a few additions and with completely reworked metrics which are generally looser, but not as loose as Computer Modern math, to make a math package that works with not only Times, but also with fonts that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. This new package differs from {\tt txfonts} in the following ways: @@ -55,7 +52,11 @@ has two options: you may write \begin{verbatim} \usepackage[scaled=.93]{newtxtext} \end{verbatim} -to load the roman and typewriter text fonts at 93\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale $0.9*0.93$. This is not of much utility if the package is used with the math package {\tt newtxmath} to which it is already matched, but may be with other math packages. The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. +to load the roman and typewriter text fonts at 93\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale $0.9*0.93$. This is not of much utility if the package is used with the math package {\tt newtxmath} to which it is already matched, but may be with other math packages. The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. In general, it is best to load {\tt newtxtext} with lining figures so the math package uses lining figures in math mode. After loading the math package, you can specify the command +\begin{verbatim} +\useosf +\end{verbatim} +to force the use of oldstyle figures in text, but not math. \section{Math mode options} The package invoked by \begin{verbatim} @@ -66,7 +67,8 @@ loads the math part of the {\tt txfonts} (with revised metrics and additional gl \item {\tt varg} causes the math italic letters \verb|g,v,w,y| to be replaced by versions which are more distinctive---eg, useful for distinguishing math italic \verb|v| from \verb|\nu|; \item {\tt libertine} loads different versions of math italic and bold math italic based on \textsf{Libertine} rather than \textsf{Times}---the {\tt varg} option is disabled in this case, as the equivalent variant forms are made available by default; \item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} rather than \textsf{Times}---the {\tt varg} option is disabled in this case, as the equivalent variant forms are made available by default---see the extended discussion below; -\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}; +\item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} option is disabled in this case, as the equivalent variant forms are made available by default. +\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion} and {\tt garamondx}; \item {\tt cmintegrals} instructs \textsf{newtxmath} to load a thicker version of the Computer Modern integral in place of the \textsf{newtxmath} default---the txfonts integral (identical to the integral in the Wolfram fonts), which is not to everyone's taste---a consequence is that none of the special forms of \textsf{txfonts} integrals are available; \item the combination @@ -81,12 +83,13 @@ causes no error, unlike the same combination with {\tt txfonts}, but does nothin \end{verbatim} allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \verb|\idotsint| defined in {\tt amsmath}, but using the pumped-up Computer Modern integral loaded by {\tt newtxmath}. \item {\tt uprightGreek} and {\tt slantedGreek} determine the form of Greek alphabet loaded---the default is {\tt uprightGreek}, which loads upright uppercase and slanted lowercase Greek symbols, as is customary in Anglo-American mathematical typesetting. With the option {\tt slantedGreek}, which you might want to use if you cared about ISO standards, all Greek symbols are slanted. No matter which is set, \verb|\Gammaup| (or \verb|\upGamma|) gives you upright \verb|\Gamma|, etc. -\item The option {\tt cmbraces} instructs {\tt newtxmath} to ignore the brace collections from {\tt txfonts}, substituting a collection based on thickened versions of the Computer Modern braces, which I find much easier to distinguish from other delimiters. This works quite well in regular weight but looks a bit clunky in bold. +\item The option {\tt cmbraces} instructs {\tt newtxmath} to ignore the brace collections from {\tt txfonts}, substituting a collection based on thickened versions of the Computer Modern braces, which I find much easier to distinguish from other delimiters. This works quite well in regular weight but looks a bit clunky in bold. I now prefer the option {\tt bigdelims}, which supersedes {\tt cmbraces}. \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 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. +\item{\tt bigdelims} loads a different math extension font and redefines most of the small and big math delimiters to have larger sizes so that, for example, there is more of a distinction between \verb|(| and \verb|\big(| in math mode. If this option is specified, {\tt cmbraces} is ignored. +%\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 once again named {\tt libertine}, but requires arguments that are different from the original {\tt libertine} package. @@ -97,24 +100,20 @@ allows you to use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \ver \usepackage{amsmath} \usepackage[varg,cmintegrals,cmbraces]{newtxmath} \usepackage{bm} % load after all math to give access to bold math -\renewcommand{\rmdefault}{ntxrj} %old-style figures in text, not in math +\useosf %old-style figures in text, not in math \end{verbatim} \textsc{Example 2:} \begin{verbatim} -\usepackage[lining,semibold]{libertine-type1} % a bit lighter than Times--no osf in math +\usepackage[lining,semibold]{libertine} % a bit lighter than Times--no osf in math \usepackage[T1]{fontenc} % best for Western European languages \usepackage{textcomp} % required to get special symbols \usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined \usepackage{amsmath,amsthm} -\usepackage[libertine,cmintegrals,cmbraces,vvmathbb]{newtxmath} +\usepackage[libertine,cmintegrals,bigdelims,vvarbb]{newtxmath} \usepackage[scr=rsfso]{mathalfa} \usepackage{bm}% load after all math to give access to bold math -%After loading math package, switch to osf in text, for which -% the following 4 lines are required. This is not so obvious. -\makeatletter -\def\libertine@figurestyle{OsF} %affects \libertine macro -\makeatother -\renewcommand*{\rmdefault}{LinuxLibertineT-OsF} % for normal text +%After loading math package, switch to osf in text. +\useosf % for osf in normal text \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. @@ -133,10 +132,19 @@ Several math glyphs have alternate forms: \end{tabular} \end{center} You should be aware that using \verb|\varnothing| requires loading AMSb.\\ -To use an alternate form throughout your document without changing all occurrencesvof the usual command, insert something like the following in your preamble after loading \texttt{newtxmath}: +To use an alternate form throughout your document without changing all occurrences of the usual command, insert something like the following in your preamble after loading \texttt{newtxmath}: \begin{verbatim} \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, +\begin{verbatim} +\documentclass[11pt,intlimits]{article} +\usepackage{newtxtext} +\usepackage[bigdelims]{newtxmath} +\end{verbatim} +will load {\tt amsmath} with option {\tt intlimits}. As of version 1.14, {\tt newtxmath} respects the {\tt amsmath} macros for placement of limits on integrals. + \section{The {\tt minion} option} This option allows the use of MinionPro as math letters (Latin and Greek) within the math font, but there are some caveats: \begin{itemize} @@ -345,7 +353,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 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. +\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. (This file is somewhat outdated. The file {\tt mathnotes.pdf} adds details about the sources for the math fonts, though it is rather cursory.) The font files {\tt ntxexmods.pfb} and {\tt ntxbexmods.pfb} were derived from {\tt cmex10.pfb} by FontForgery, thickening the Computer Modern braces to match the weight of the \textsf{txfonts} braces. The pair {\tt ntxexb.pfb} and {\tt ntxbexb.pfb} were similarly derived from {\tt cmsy7.pfb} and {\tt cmex10.pfb} to produce more braces and matching integral signs based on Computer Modern. The {\tt.tfm} files {\tt rtx[b]mio.tfm} are simply unslanted versions of {\tt rtxmi}, from which we construct upright partial derivative symbols. The last two entries provide us with a way to access custom-encoded versions of {\tt fxlri.pfb} and {\tt fxlbi.map} in order to access some of the unencoded alternate characters---eg, Greek letters, {\tt J.alt} and {\tt v.alt}. The font file \textsf{LibertineTheta-Regular.pfb} was created from the Theta symbol in {\tt fxlri.pfb}, which requires some FontForge help to look correct. diff --git a/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc b/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc index 6f405417550..85cabeeebae 100644 --- a/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc +++ b/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc @@ -3,7 +3,7 @@ % Encodes alternative glyphs in ntx[b]mia. /ntxmiaaltEncoding [ % 0x00 - /.notdef /.notdef /.notdef /.notdef + /parenleft1 /parenright1 /bracketleft1 /bracketright1 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef @@ -33,10 +33,10 @@ /.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 +/.notdef /.notdef /floorleft /floorright +/ceilingleft /ceilingright /braceleft /braceright +/angleleft /angleright /bar /bardbl +/arrowbothv /arrowdblbothv /.notdef /.notdef % 0x70 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxbexx.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbexx.tfm Binary files differnew file mode 100644 index 00000000000..d1022c2c929 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxbexx.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 8878282b3e7..6af73fec7f6 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/ntxexx.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxexx.tfm Binary files differnew file mode 100644 index 00000000000..c79e8a68d62 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxexx.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 316440d7dcd..ffb28edf217 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/ntxsybalt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsybalt.tfm Binary files differindex 04f5ece002d..1f0fb49e162 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxsybalt.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsybalt.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.tfm Binary files differindex d9b1f188917..72db6536506 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxsyralt.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 7d3a1b34ebd..ec1307f0cdb 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/nxlmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/nxlmia.tfm Binary files differindex 2624ca53bd6..5b1841714f8 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/txbex-bar.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/txbex-bar.tfm Binary files differindex 283406ad70f..442fa3a2799 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/txbex-bar.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/txbex-bar.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/txex-bar.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/txex-bar.tfm Binary files differindex 5b248a11aeb..57cd1851f02 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/txex-bar.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/txex-bar.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb b/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb Binary files differindex 18704be8f7d..92c95a0a2d5 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/ntxsybalt.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb b/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb Binary files differindex 293b18ae65b..5e4b1a484eb 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/ntxsyralt.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/txbex-bar.pfb b/Master/texmf-dist/fonts/type1/public/newtx/txbex-bar.pfb Binary files differindex 4ce8e46ed12..a9de1327dd2 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/txbex-bar.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/txbex-bar.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newtx/txex-bar.pfb b/Master/texmf-dist/fonts/type1/public/newtx/txex-bar.pfb Binary files differindex ea3b75baf86..a12fe28391a 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/txex-bar.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/txex-bar.pfb diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxbexx.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbexx.vf Binary files differnew file mode 100644 index 00000000000..04a4964350d --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxbexx.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf Binary files differindex bd684d10b36..a2b395aa0ce 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxexx.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxexx.vf Binary files differnew file mode 100644 index 00000000000..07ffb344f1b --- /dev/null +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxexx.vf diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf Binary files differindex 2915c7985d7..294adcd7079 100644 --- a/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf +++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.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 bc45373c7ab..79c24206756 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/nxlmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/nxlmia.vf Binary files differindex 5e506505beb..3d4695777bc 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/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index db0b4186c3b..56e87661afb 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.13} -\def\filedate{2013/08/07} +\def\fileversion{1.14} +\def\filedate{2013/09/04} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -24,6 +24,7 @@ \input{binhex} \RequirePackage{xkeyval} +\let\ntxmath@scaled\@empty \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} \DeclareOption*{% \begingroup @@ -34,11 +35,12 @@ \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 -\newif\iftx@gm +\newif\iftx@gm \newif\iftx@bigdelims \tx@symbolsCtrue \newif\iftx@altnu \newif\iftx@largelibfigs \newif\iftx@minion \newif\iftx@libaltvw +\DeclareOption{bigdelims}{\tx@bigdelimstrue} \DeclareOption{varbb}{\tx@varbbtrue} \DeclareOption{vvarbb}{\tx@vvarbbtrue} \DeclareOption{libaltvw}{\tx@libaltvwtrue} @@ -58,6 +60,8 @@ amssymbols,uprightGreek} \ProcessOptions* +%bigdelims cancels cmbraces +\iftx@bigdelims\tx@bracesfalse\fi % No varg option with option libertine or option minion or garamond \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 @@ -169,15 +173,23 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%%%%% % Math Extension % %%%%%%%%%%%%%%%%%% - -\iftx@braces% - \DeclareSymbolFont{largesymbols}{OMX}{ntxexv}{m}{n} - \SetSymbolFont{largesymbols}{bold}{OMX}{ntxexv}{b}{n} - \DeclareFontSubstitution{OMX}{ntxexv}{m}{n} -\else% - \DeclareSymbolFont{largesymbols}{OMX}{ntxex}{m}{n} - \SetSymbolFont{largesymbols}{bold}{OMX}{ntxex}{b}{n} - \DeclareFontSubstitution{OMX}{ntxex}{m}{n} +% no OMX used +\DeclareFontEncoding{LMX}{}{} +\DeclareFontSubstitution{LMX}{ntxexx}{m}{n} +\DeclareFontFamily{LMX}{ntxexx}{} +\DeclareFontShape{LMX}{ntxexx}{m}{n}{<-> \ntxmath@scaled ntxexx}{} +\DeclareFontShape{LMX}{ntxexx}{b}{n}{<-> \ntxmath@scaled ntxbexx}{} +\DeclareFontShape{LMX}{ntxexx}{bx}{n}{<->ssub ntxexx/b/n}{} +\DeclareSymbolFont{largesymbols}{LMX}{ntxexx}{m}{n} +\SetSymbolFont{largesymbols}{bold}{LMX}{ntxexx}{b}{n} + +\iftx@bigdelims + %default definitions of \big etc need some changes + %\renewcommand{\big}{\bBigg@\@ne} + \AtBeginDocument{\renewcommand{\Big}{\bBigg@{1.3}} + \renewcommand{\bigg}{\bBigg@{1.73}} + \renewcommand{\Bigg}{\bBigg@{2.16}} + } \fi% %%%%%%%%%%%%%%%%%%%% % Math Extension A % @@ -263,14 +275,45 @@ amssymbols,uprightGreek} %Change the following two so we can adjust metrics in math mode %\DeclareMathDelimiter{(}{\mathopen}{operators}{40}{largesymbols}{0} %\DeclareMathDelimiter{)}{\mathclose}{operators}{41}{largesymbols}{1} -\iftx@minion\else - \iftx@libertine% - \DeclareMathDelimiter{(}{\mathopen}{lettersA}{123}{largesymbols}{0} - \DeclareMathDelimiter{)}{\mathclose}{lettersA}{124}{largesymbols}{1} - \else %Times - \DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0} - \DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1} +\iftx@bigdelims + \DeclareMathDelimiter{(}{\mathopen}{lettersA}{155}{largesymbols}{130} + \DeclareMathDelimiter{)}{\mathclose}{lettersA}{156}{largesymbols}{131} + \DeclareMathDelimiter{[}{\mathopen}{lettersA}{157}{largesymbols}{132} + \DeclareMathDelimiter{]}{\mathclose}{lettersA}{158}{largesymbols}{133} + \DeclareMathDelimiter{\lfloor}{\mathopen}{lettersA}{159}{largesymbols}{134} + \DeclareMathDelimiter{\rfloor}{\mathclose}{lettersA}{160}{largesymbols}{135} + \DeclareMathDelimiter{\lceil}{\mathopen}{lettersA}{161}{largesymbols}{136} + \DeclareMathDelimiter{\rceil}{\mathclose}{lettersA}{162}{largesymbols}{137} + \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{163}{largesymbols}{138} + \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{164}{largesymbols}{139} + \DeclareMathDelimiter{\langle}{\mathopen}{lettersA}{165}{largesymbols}{140} + \DeclareMathDelimiter{<}{\mathopen}{lettersA}{165}{largesymbols}{140} + \DeclareMathDelimiter{\rangle}{\mathclose}{lettersA}{166}{largesymbols}{141} + \DeclareMathDelimiter{>}{\mathclose}{lettersA}{166}{largesymbols}{141} + \DeclareMathSymbol{\mid}{\mathrel}{lettersA}{96} + \DeclareMathDelimiter{|}{\mathord}{lettersA}{96}{largesymbols}{128} + \DeclareMathDelimiter{\arrowvert}{\mathord}{lettersA}{167}{largesymbols}{60} + \DeclareMathDelimiter{\vert}{\mathord}{lettersA}{96}{largesymbols}{128} + %\DeclareMathSymbol{\parallel}{\mathrel}{lettersA}{129} + \DeclareMathDelimiter{\Arrowvert}{\mathord}{lettersA}{168}{largesymbols}{61} + \DeclareMathDelimiter{\Vert}{\mathord}{lettersA}{128}{largesymbols}{129} + \let\|=\Vert + \DeclareMathDelimiter{\updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{63} + \DeclareMathDelimiter{\Updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{119} +\else + \iftx@braces + \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{142} + \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{143} \fi + \iftx@minion\else + \iftx@libertine% + \DeclareMathDelimiter{(}{\mathopen}{lettersA}{123}{largesymbols}{0} + \DeclareMathDelimiter{)}{\mathclose}{lettersA}{124}{largesymbols}{1} + \else %Times + \DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0} + \DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1} + \fi + \fi \fi %\DeclareMathSymbol{+}{\mathbin}{operators}{43} %\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14} @@ -279,6 +322,7 @@ amssymbols,uprightGreek} %\DeclareMathSymbol{;}{\mathpunct}{operators}{59} \DeclareMathSymbol{=}{\mathrel}{lettersA}{61} %\DeclareMathSymbol{?}{\mathclose}{operators}{63} +%change the following two for better sizing %\DeclareMathDelimiter{[}{\mathopen}{operators}{91}{largesymbols}{2} %\DeclareMathDelimiter{]}{\mathclose}{operators}{93}{largesymbols}{3} %\DeclareMathAccent{\hat}{\mathalpha}{operators}{94} @@ -467,11 +511,30 @@ amssymbols,uprightGreek} %\DeclareMathSymbol{\diamondsuit}{\mathord}{symbols}{125} %\DeclareMathSymbol{\heartsuit}{\mathord}{symbols}{126} %\DeclareMathSymbol{\spadesuit}{\mathord}{symbols}{127} -\iftx@braces% - \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} - \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} -\fi - +%\iftx@bigdelims +% \re@DeclareMathDelimiter{(}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{)}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{[}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{]}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% +%\else +% \iftx@braces% +% \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8} +% \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9} +% \fi +%\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Symbol A Definitions % AMSa %%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1178,65 +1241,67 @@ amssymbols,uprightGreek} \re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsTXA}{32} % \iftx@cmint -% added 2012-04-16 - \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsTXA}{84} - \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsTXA}{86} - \ifx\AmSfont\@undefined - \def\oint{\ointop\nolimits} - \def\int{\intop\nolimits} - \fi + \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbols}{150} + \re@DeclareMathSymbol{\intop}{\mathop}{largesymbols}{152} +% \ifx\AmSfont\@undefined +% \def\oint{\ointop\nolimits} +% \def\int{\intop\nolimits} +% \fi \else % use tx integrals - \ifx\AmSfont\@undefined\else - % The following are needed if amsmath has been loaded - \let\iint\relax - \let\iiint\relax - \let\iiiint\relax - \let\idotsint\relax - \fi +% \ifx\AmSfont\@undefined\else +% % The following are needed if amsmath has been loaded +% \let\iint\relax +% \let\iiint\relax +% \let\iiiint\relax +% \let\idotsint\relax +% \fi +%\renewcommand{\iint}{\DOTSI\protect\MultiIntegral{2}} +%\renewcommand{\iiint}{\DOTSI\protect\MultiIntegral{3}} +%\renewcommand{\iiiint}{\DOTSI\protect\MultiIntegral{4}} \re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsTXA}{8} - \def\oiint{\oiintop\nolimits} + \def\oiint{\oiintop\ilimits@} \re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsTXA}{10} - \def\ointctrclockwise{\ointctrclockwiseop\nolimits} + \def\ointctrclockwise{\ointctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsTXA}{12} - \def\ointclockwise{\ointclockwiseop\nolimits} + \def\ointclockwise{\ointclockwiseop\ilimits@} \re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsTXA}{14} - \def\sqint{\sqintop\nolimits} + \def\sqint{\sqintop\ilimits@} \re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsTXA}{33} - \def\iint{\iintop\nolimits} + \def\iint{\iintop\ilimits@} \re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsTXA}{35} - \def\iiint{\iiintop\nolimits} + \def\iiint{\iiintop\ilimits@} \re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsTXA}{37} - \def\iiiint{\iiiintop\nolimits} + \def\iiiint{\iiiintop\ilimits@} \re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsTXA}{39} - \def\idotsint{\idotsintop\nolimits} + \def\idotsint{\idotsintop\ilimits@} \re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsTXA}{41} - \def\oiiint{\oiiintop\nolimits} + \def\oiiint{\oiiintop\ilimits@} \re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsTXA}{43} - \def\varointctrclockwise{\varointctrclockwiseop\nolimits} + \def\varointctrclockwise{\varointctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsTXA}{45} - \def\varointclockwise{\varointclockwiseop\nolimits} + \def\varointclockwise{\varointclockwiseop\ilimits@} \re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsTXA}{62} - \def\fint{\fintop\nolimits} + \def\fint{\fintop\ilimits@} \re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsTXA}{64} - \def\oiintctrclockwise{\oiintctrclockwiseop\nolimits} + \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsTXA}{66} - \def\varoiintclockwise{\varoiintclockwiseop\nolimits} + \def\varoiintclockwise{\varoiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{68} - \def\oiiintctrclockwise{\oiiintctrclockwiseop\nolimits} + \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsTXA}{70} - \def\varoiiintclockwise{\varoiiintclockwiseop\nolimits} + \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsTXA}{72} - \def\oiintclockwise{\oiintclockwiseop\nolimits} + \def\oiintclockwise{\oiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsTXA}{74} - \def\varoiintctrclockwise{\varoiintctrclockwiseop\nolimits} + \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsTXA}{76} - \def\oiiintclockwise{\oiiintclockwiseop\nolimits} + \def\oiiintclockwise{\oiiintclockwiseop\ilimits@} \re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{78} - \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\nolimits} + \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@} \re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsTXA}{80} - \def\sqiint{\sqiintop\nolimits} + \def\sqiint{\sqiintop\ilimits@} \re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsTXA}{82} - \def\sqiiint{\sqiiintop\nolimits} + \def\sqiiint{\sqiiintop\ilimits@} \fi diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 0e25b8491c8..e26e49895c2 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.12} -\def\filedate{2013/07/20} +\def\fileversion{1.13} +\def\filedate{2013/09/07} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} @@ -48,7 +48,7 @@ % Text Serif (Times) % %%%%%%%%%%%%%%%%%%%%%% -\renewcommand{\rmdefault}{ntxr\ntx@style} +\renewcommand*{\rmdefault}{ntxr\ntx@style} \def\useosf{\renewcommand*{\rmdefault}{ntxrj}} \@onlypreamble\useosf |