diff options
| -rw-r--r-- | Master/texmf-dist/doc/fonts/newtx/README | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf | bin | 449823 -> 450842 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/tfm/public/newtx/ntxbmia.tfm | bin | 2996 -> 3008 bytes | |||
| -rw-r--r-- | Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm | bin | 3000 -> 3012 bytes | |||
| -rw-r--r-- | Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf | bin | 2148 -> 2200 bytes | |||
| -rw-r--r-- | Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf | bin | 2156 -> 2204 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 87 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxmia.fd | 23 |
9 files changed, 100 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index b60a53a772c..a1e457e971c 100644 --- a/Master/texmf-dist/doc/fonts/newtx/README +++ b/Master/texmf-dist/doc/fonts/newtx/README @@ -1,10 +1,14 @@ This package, initially 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.528 2017-11-24 +Current version: 1.53 2017-12-14 This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3 for the details of that license. +Changes in version 1.53 +1. Package now requires the centernot package, used to construct better replacements for negated relations when to option nosymbolsC is specified. +2. Added code to handle enhanced option charter to newtxmath. The new version makes use of newly constructed Greek letters that match the Charter design. + Changes in version 1.528 Spacing corrections in math for comma and period under option utopia (or erewhon.) diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf Binary files differindex 5ca124d59c2..38aa38832f6 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 7a925ca2e53..5cc458b151e 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex @@ -197,7 +197,7 @@ Don't use these unless you know what you're doing. \item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. \item {\tt baskervaldx} (or {\tt Baskervaldx}) loads different versions of math italic and bold math italic based on \textsf{Baskervaldx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. \item {\tt baskerville} (or {\tt Baskerville}, or {\tt baskervillef} or {\tt BaskervilleF}) loads different versions of math italic and bold math italic based on \textsf{BaskervilleF} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. -\item {\tt charter} (or {\tt xcharter}) loads different versions of math italic and bold math italic based on \textsf{XCharter} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. +\item {\tt charter} (or {\tt xcharter}) loads different versions of math italic and bold math italic based on \textsf{XCharter} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. \textbf{As of version 1.53, Greek letters in all styles are takenn from new alphabets constructed to match the Charter style.} \item {\tt cochineal} loads different versions of math italic and bold math italic based on \textsf{cochineal} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. \item {\tt utopia} (or {\tt heuristica} or {\tt erewhon}) loads different versions of math italic and bold math italic based on \textsf{Utopia} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. The Heuristica or Erewhon font package must be installed to use this option. (Erewhon is based on Heuristica, but is 6\% smaller and has more complete figures styles and small cap styles, as well as a variety of smaller figures---superior, inferior, numerator, denominator.) For example: \begin{verbatim} @@ -233,8 +233,14 @@ causes no error, unlike the same combination with {\tt txfonts}, but does nothin \item Option {\tt nonewtxmathopt} (or {\tt scale}, a mistake I cannot now erase) causes newtxmath to not make use of the optical math sizes (7{\tt pt}, 5{\tt pt}), as preferred by some. \item Option {\tt subscriptcorrection} enables the special spacing of some subscripts. (The default is {\tt nosubscriptcorrection}.) \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 AMSm}) 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 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}.) If this option is selected, then, as of version 1.53, new definitions are made for the missing negated symbols. The package {\tt centernot} is now required. +\item {\tt amssymbols} (the default) and {\tt noamssymbols} determine whether the {\tt txfonts} versions of the \textsc{ams} symbols ({\tt AMSm}) 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.) \textbf{Important note:} if you load an AMS class, like {\tt amsart}, then some trickery will be involved. The AMS classes have an option, {\tt noamsfonts} which currently (2017) does not work as advertised, but should be fixed in \TeX Live 2018. It is supposed to prevent the loading of {\tt AMSa} and {\tt AMSb}, which waste two slots. The following workaround seems like a reasonable stopgap until then. +\begin{verbatim} +\def\symAMSb{5} +\documentclass[noamsfonts]{amsart} %or other AMS classes +\let\symAMSb\@undefined +\end{verbatim} +This method of loading the AMS class will save you two slots. \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{\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. (This option is unnecessary, as of version 1.5.) \item{\tt liby} has an effect only if the libertine option is selected---with this option, the math italic y is chosen to be Libertine's italic y instead of the default one from txfonts. 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 93fb6a44079..890a5bccffa 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/ntxmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxmia.tfm Binary files differindex 71df9f82305..d9b4cd3b400 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/vf/public/newtx/ntxbmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxbmia.vf Binary files differindex bf1406b4897..372751f043b 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/ntxmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxmia.vf Binary files differindex d8ebdda70ff..3847c0dc703 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/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index bad77e83019..845421d53b1 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.527} -\def\filedate{2017/09/11} +\def\fileversion{1.53} +\def\filedate{2017/12/14} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -21,6 +21,7 @@ \let\newtxmathLoaded\endinput \RequirePackage{amsmath} % improves extendable delimiter handling \RequirePackage{ifxetex,ifluatex,xkeyval} +\RequirePackage{centernot} % for proper handling of negated relations \newif\ifxl@otf \xl@otffalse \ifxetex \xl@otftrue @@ -1368,7 +1369,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \let\ne=\neq \re@DeclareMathSymbol{\nasymp}{\mathrel}{symbolsC}{45} \re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} -\re@DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47} +%\re@DeclareMathSymbol{\nsim}{\mathrel}{symbolsC}{47} \re@DeclareMathSymbol{\napprox}{\mathrel}{symbolsC}{48} %\re@DeclareMathSymbol{\nsubset}{\mathrel}{symbolsC}{49} %\re@DeclareMathSymbol{\nsupset}{\mathrel}{symbolsC}{50} @@ -1483,6 +1484,45 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\multimapdotbothvert}{\mathrel}{symbolsC}{150} \re@DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151} \re@DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152} +\else % tx@symbolsCfalse + \newcommand*{\nvarparallel}{\centernot\varparallel} + \newcommand*{\nvarparallelinv}{\centernot\varparallelinv} + \newcommand*{\nprecsim}{\centernot\precsim} + \newcommand*{\nsuccsim}{\centernot\succsim} + \newcommand*{\nlesssim}{\centernot\lesssim} + \newcommand*{\ngtrsim}{\centernot\gtrsim} + \newcommand*{\nlessapprox}{\centernot\lessapprox} + \newcommand*{\ngtrapprox}{\centernot\gtrapprox} + \newcommand*{\npreccurlyeq}{\centernot\preccurlyeq} + \newcommand*{\nsucccurlyeq}{\centernot\succcurlyeq} + \newcommand*{\ngtrless}{\centernot\gtrless} + \newcommand*{\nlessgtr}{\centernot\lessgtr} + \newcommand*{\nbumpeq}{\centernot\bumpeq} + \newcommand*{\nBumpeq}{\centernot\Bumpeq} + \newcommand*{\nbacksim}{\centernot\backsim} + \newcommand*{\nbacksimeq}{\centernot\backsimeq} + \newcommand*{\nasymp}{\centernot\asymp} + \newcommand*{\nequiv}{\centernot\equiv} + %\newcommand*{\nsim}{\centernot\sim} + \newcommand*{\napprox}{\centernot\approx} + \newcommand*{\nll}{\centernot\ll} + \newcommand*{\ngg}{\centernot\gg} + \newcommand*{\nthickapprox}{\centernot\thickapprox} + \newcommand*{\napproxeq}{\centernot\approxeq} + \newcommand*{\nprecapprox}{\centernot\precapprox} + \newcommand*{\nsuccapprox}{\centernot\succapprox} + \newcommand*{\npreceqq}{\centernot\preceqq} + \newcommand*{\nsucceqq}{\centernot\succeqq} + \newcommand*{\nsimeq}{\centernot\simeq} + \newcommand*{\nSubset}{\centernot\Subset} + \newcommand*{\nSupset}{\centernot\Supset} + \newcommand*{\nsqsubseteq}{\centernot\sqsubseteq} + \newcommand*{\nsqsupseteq}{\centernot\sqsupseteq} + \newcommand*{\nplus}{\centernot\plus} + \newcommand*{\nsqsubset}{\centernot\sqsubset} + \newcommand*{\nsqsupset}{\centernot\sqsupset} + \newcommand*{\ntwoheadrightarrow}{\centernot\twoheadrightarrow} + \newcommand*{\ntwoheadleftarrow}{\centernot\twoheadleftarrow} \fi % The following may be used for [[ and ]] without loading symbolsC as a math family. They replace \llbracket and \rrbracket. \def\dlb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char126}}} @@ -2090,6 +2130,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \fi %%\fi +% Changed again 20171121 to prevent possible damage due pandoc %%% \not redefined: %%% \not= becomes \ne %%% \not< becomes \nless @@ -2099,22 +2140,34 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %%% otherwise, \not\XXX is done in the usual way. \DeclareMathSymbol{\n@tch@r}{\mathrel}{symbols}{54} +\@namedef{not=}{\ne} +\@namedef{not>}{\ngtr} +\@namedef{not<}{\nless} \DeclareRobustCommand*{\not}[1]{% - \ifx #1=\ne\else - \ifx #1<\nless\else - \ifx #1>\ngtr\else - \n@t@@n{#1}\fi\fi\fi} - -\def\n@t@@n#1{% - \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup% - \expandafter\@ifundefined{\@gtempa}% - {\not@n@{#1}}% - {\@nameuse{\@gtempa}}} + \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup + \@ifundefined{\@gtempa}% + {\not@n@{#1}}% + {\@nameuse{\@gtempa}}} \def\not@n@#1{% - \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup% - \expandafter\@ifundefined{\@gtempa}% - {\n@tch@r #1}% - {\@nameuse{\@gtempa}}} + \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup + \@ifundefined{\@gtempa}% + {\n@tch@r #1}% + {\@nameuse{\@gtempa}}} +% \ifx #1=\ne\else +% \ifx #1<\nless\else +% \ifx #1>\ngtr\else +% \n@t@@n{#1}\fi\fi\fi} +% +%\def\n@t@@n#1{% +% \begingroup \escapechar\m@ne\xdef\@gtempa{not\string#1}\endgroup% +% \expandafter\@ifundefined{\@gtempa}% +% {\not@n@{#1}}% +% {\@nameuse{\@gtempa}}} +%\def\not@n@#1{% +% \begingroup \escapechar\m@ne\xdef\@gtempa{n\string#1}\endgroup% +% \expandafter\@ifundefined{\@gtempa}% +% {\n@tch@r #1}% +% {\@nameuse{\@gtempa}}} %%% %%% for AMS classes diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd index 0cd65a77a33..0802dfc7b5b 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd @@ -39,13 +39,22 @@ <-> \ntxmath@scaled zcochbmia }{} \else - \DeclareFontShape{U}{ntxmia}{m}{it}{ - <-> \ntxmath@scaled ntxmia - }{} - - \DeclareFontShape{U}{ntxmia}{b}{it}{ - <-> \ntxmath@scaled ntxbmia - }{} + \iftx@ch + \DeclareFontShape{U}{ntxmia}{m}{it}{ + <-> \ntxmath@scaled zchmia + }{} + \DeclareFontShape{U}{ntxmia}{b}{it}{ + <-> \ntxmath@scaled zchbmia + }{} + \else + \DeclareFontShape{U}{ntxmia}{m}{it}{ + <-> \ntxmath@scaled ntxmia + }{} + + \DeclareFontShape{U}{ntxmia}{b}{it}{ + <-> \ntxmath@scaled ntxbmia + }{} + \fi \fi \fi \fi |