summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-12 21:23:43 +0000
committerKarl Berry <karl@freefriends.org>2018-05-12 21:23:43 +0000
commit0e53f017906714054c2d533bf05a33780320576b (patch)
treebb9b182049e7125a1e300b710bc113162a23aa1e
parent3c05f18d5c5a389dddaa70e653990439e5e61162 (diff)
newtx (12may18)
git-svn-id: svn://tug.org/texlive/trunk@47693 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/newtx/README7
-rw-r--r--Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdfbin457943 -> 453876 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex27
-rw-r--r--Master/texmf-dist/fonts/afm/public/newtx/txbmiaX.afm174
-rw-r--r--Master/texmf-dist/fonts/afm/public/newtx/txmiaX.afm214
-rw-r--r--Master/texmf-dist/fonts/map/dvips/newtx/newtx.map6
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmi.tfmbin0 -> 1944 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmia.tfmbin0 -> 3044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mi.tfmbin0 -> 1932 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mia.tfmbin0 -> 2936 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/stx2rm.tfmbin0 -> 1880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/txbmiaX.tfmbin0 -> 1576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/newtx/txmiaX.tfmbin0 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/newtx/txbmiaX.pfbbin0 -> 35168 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/newtx/txmiaX.pfbbin0 -> 36503 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmi.vfbin0 -> 1032 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmia.vfbin0 -> 1840 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mi.vfbin0 -> 964 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mia.vfbin0 -> 1748 bytes
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty263
-rw-r--r--Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd27
-rw-r--r--Master/texmf-dist/tex/latex/newtx/untxmia.fd25
22 files changed, 683 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README
index 37f28f26ac1..ca0b159e9c3 100644
--- a/Master/texmf-dist/doc/fonts/newtx/README
+++ b/Master/texmf-dist/doc/fonts/newtx/README
@@ -1,10 +1,15 @@
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.54 2018-04-10
+Current version: 1.55 2018-05-11
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.55
+1. Added new option stix2 to newtxmath, resulting in using Roman and Greek letters from STIX2 with symbols from newtxmath.
+2. Modified the handling of secondary alphabets loaded not using \DeclareMathAlphabet. These now allow multiple tokens rather than a single one, and provide a way to get to dotlessi and dotlessj if they exists in the secondary alphabet.
+3. Added direct links to DSSerif glyphs under the stix2 option, making use of the changes in 2 above. E.g., \varmathbb{A\imath\dots x\alpha} does pretty much what you would expect, passing along \dots and \alpha to be handled by LaTeX, but rendering the other characters using the DSSerif font when under the option stix2.
+
Changes in version 1.54
Added option noxchvw (or, equivalently, noXchvw) to newtxmath. This affects only math usage with XCharter, supressing the default math italic v and w and in favor of the Charter italic glyphs. (This may lead to problems distinguishing math italic v from Greek math \nu.)
diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
index 3e3b5031543..0aee9d9ef82 100644
--- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
+++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
index c67a8fa7108..df822db02cc 100644
--- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
+++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
@@ -23,12 +23,13 @@
\newtheorem{thm}{Theorem}[section]
%\pdfmapfile{=newtx.map}
\usepackage[osf,largesc,theoremfont]{newtxtext}
-\usepackage[OT1]{fontenc}
+\usepackage[T1]{fontenc}
\usepackage[varqu,varl]{zi4}
%\traceon
\usepackage{newtxmath}
%\traceoff
%\useosf
+\DeclareMathSymbol{\bbZ}{\mathord}{lettersA}{218}
\usepackage{bm}
%SetFonts
\makeatletter
@@ -48,7 +49,7 @@ This package is meant to be a replacement for Young Ryu's {\tt txfonts}. It is
-This math package works, after possibly replacing its math Roman and Greek letters, with fonts other than Times 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 math package works, after possibly replacing its math Roman and Greek letters, with fonts other than Times 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. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the newly released {\tt STIX2} text fonts.
The {\tt newtx} package differs from {\tt txfonts} in the following ways:
\begin{itemize}
@@ -209,6 +210,7 @@ Don't use these unless you know what you're doing.
\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 varvw} causes the math italic letters \verb|v,w| 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} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default;
+\item (new in version 1.55) {\tt stix2} loads different versions of math italic and bold math italic based on \textsf{StixTwoMath} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the documentation to the {\tt SticksToo} package, which contains more details and some math samples.
\item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} 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---see the extended discussion below;
\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.
@@ -223,7 +225,7 @@ Don't use these unless you know what you're doing.
\usepackage[scaled=.95]{cabin} % sans serif
\usepackage[utopia,vvarbb]{newtxmath}
\end{verbatim}
-\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx} and {\tt cochineal};
+\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt stix2} and {\tt cochineal};
\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;
\textbf{as of version 1.5, this option does nothing, as the new default is slanted integrals.}
@@ -251,7 +253,7 @@ causes no error, unlike the same combination with {\tt txfonts}, but does nothin
\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}.) 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.
+\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 is 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
@@ -436,6 +438,7 @@ Math font packages in \LaTeX\ are susceptible to the ``Too many math alphabets''
\end{verbatim}
\textsc{Notes:}
\begin{itemize}
+\item If using one of the AMS classes (e.g., {\tt amsart}, {\tt amsbook}), you can save two or more math families by adding the option {\tt noamsfonts} in your \verb|\documentclass| call. As of early 2018, This works only with the most recent versions the AMS classes available in both TexLive and MiKTeX.
\item
The {\tt operators} font is essentially the Roman text font, used for names of operators and as the target for \verb|\mathrm|---its bold version is used as the target for \verb|\mathbf|;
\item {\tt operators} is defined to be the OT$1$ encoded version of the text font in cases where that version is known to contain upright uppercase Greek letters in its forst eleven slots---eg, newtxtext, libertine.
@@ -501,9 +504,10 @@ As mentioned briefly above, the package now has a new blackboard bold alphabet b
\begin{itemize}
\item
the default, called by \verb|\mathbb| is quite ugly and indistinct, but does cooperate with the bolding macros \verb|\bm| and \verb|\boldsymbol|;
-\item the original variant form called with the macro \verb|\varmathbb| is better, but the macro conflicts with \verb|\bm|. (In fact, the bold version is identical to the regular version, but it is still not right that it conflicts with them.) The problem stems from the part of the definition of \verb|\varmathbb| which allows you to insert an argument with more than one character, like \verb|\varmathbb{ABC}|. Another problem with \verb|\varmathbb| is that it conflicts with {\tt hyperref}---if you use the macro in a moveable argument such as a section heading, you will provoke a \LaTeX\ error message. The solution is to use macros that take a single character as argument, like \verb|\vmathbb{A}| and \verb|\vvmathbb{A}|, which both cooperate with \verb|\bm| and {\tt hyperref}.
-\item the third, new, alphabet is borrowed from the STIX fonts---it is sharp and quite clear, geometric in design. The only slight problem is that it lacks a full bold version, with only the letters C, D, H, N, P, Q, R, Z, d, e, i and j available. The macro \verb|\vvmathbb| provided to access this alphabet allows only a single character for its argument. The new option {\tt vvarbb} effectively makes \verb|\mathbb| mean the same as \verb|\vvmathbb|.
+\item the original variant form called with the macro \verb|\varmathbb| is better, but the macro conflicts with \verb|\bm|. (In fact, the bold version is identical to the regular version, but it is still not right that it conflicts with them.) The problem stems from the part of the definition of \verb|\varmathbb| which allows you to insert an argument with more than one character, like \verb|\varmathbb{ABC}|. Another problem with \verb|\varmathbb| is that it conflicts with {\tt hyperref}---if you use the macro in a moveable argument such as a section heading, you will provoke a \LaTeX\ error message. The solution is to use macros that take a single character as argument, like \verb|\vmathbb{A}| and \verb|\vvmathbb{A}|, which both cooperate with {\tt hyperref}.
+\item the third, new, alphabet is borrowed from the STIX fonts---it is sharp and quite clear, geometric in design. The macro \verb|\vvmathbb| provided to access this alphabet. The new option {\tt vvarbb} effectively makes \verb|\mathbb| mean the same as \verb|\vvmathbb|.
(The reason for including these in the \textsf{newtx} package rather than calling them from the \textsf{mathalfa} package is that \textsf{newtx} leaves very little space for new math symbol fonts and math alphabets, and this way requires no additional such resources.
+\item \textbf{Important note:} Under the option {\tt stix2}, there are still three blackboard fonts but the macro \verb|\vmathbb| now points to glyphs from {\tt DSSerif}, a serifed double-struck family that replaces the original variant that is still available under other options.
\end{itemize}
One interesting feature of the new alphabet is that it contains blackboard bold numbers, of which $0$ and $1$ will likely be the most useful, perhaps as operator names. I find $\vvmathbb{1}$=\verb|$\vvmathbb{1}$| useful in specifying an indicator, AKA characteristic function. Here are some examples:
@@ -520,6 +524,17 @@ Variant 2 & \verb|$\vvmathbb{R}}$| $\vvmathbb{R}$& \verb|{\boldmath $\vvmathbb{R
\bottomrule
\end{tabular}
\end{center}
+The macros \verb|\vmathbb| and \verb|\vvmathbb| have been substantially rewritten as of version 1.55 and can now accept strings as arguments rather than just single characters. At some point in time, the \verb|\bm| and \verb|\boldsymbol| macros stopped working with the prior versions of these macros, and that remains a problem with the new versions. If you need only a few blackboard bold symbols, it may be better practice to define macros for each, including bold versions you might need. E.g., the your preamble:
+\begin{verbatim}
+\let\bbZ\undefined
+\DeclareMathSymbol{\bbZ}{\mathord}{lettersA}{218} $ Z may not always be in this location
+\end{verbatim}
+Then, \verb|\bm| will correctly understand
+\begin{verbatim}
+\bbZ\;\bm{\bbZ}
+\end{verbatim}
+and render it as
+\[\bbZ\;\bm{\bbZ}\]
\section{Samples from free Times and Libertine packages}
\textsc{TXFONTS:}\\
diff --git a/Master/texmf-dist/fonts/afm/public/newtx/txbmiaX.afm b/Master/texmf-dist/fonts/afm/public/newtx/txbmiaX.afm
new file mode 100644
index 00000000000..65d9aa63f89
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/newtx/txbmiaX.afm
@@ -0,0 +1,174 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20170730
+Comment Creation Date: Tue Apr 17 15:51:39 2018
+FontName txbmiaX
+FullName txbmiaX
+FamilyName txbmiaX
+Weight Medium
+Notice (Version 3.1, GPL)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 3.1
+EncodingScheme FontSpecific
+FontBBox -24 -240 1032 750
+CapHeight 671
+XHeight 461
+Ascender 681
+Descender -161
+StartCharMetrics 152
+C 0 ; WX 611 ; N Gamma ; B 16 0 583 676 ;
+C 1 ; WX 627 ; N Delta ; B 24 0 603 676 ;
+C 2 ; WX 778 ; N Theta ; B 35 -19 743 691 ;
+C 3 ; WX 722 ; N Lambda ; B 16 0 701 694 ;
+C 4 ; WX 677 ; N Xi ; B 56 0 622 662 ;
+C 5 ; WX 778 ; N Pi ; B 20 0 759 662 ;
+C 6 ; WX 654 ; N Sigma ; B 6 0 622 662 ;
+C 7 ; WX 722 ; N Upsilon ; B 20 0 719 676 ;
+C 8 ; WX 830 ; N Phi ; B 38 0 792 662 ;
+C 9 ; WX 780 ; N Psi ; B 15 0 765 670 ;
+C 10 ; WX 801 ; N Omega ; B 37 0 764 677 ;
+C 11 ; WX 605 ; N alpha ; B 37 -13 588 474 ;
+C 12 ; WX 550 ; N beta ; B 57 -231 519 727 ;
+C 13 ; WX 550 ; N gamma ; B 28 -231 523 474 ;
+C 14 ; WX 550 ; N delta ; B 40 -13 511 727 ;
+C 15 ; WX 411 ; N uni03F5 ; B 25 -3 408 458 ;
+C 16 ; WX 495 ; N zeta ; B 47 -180 476 735 ;
+C 17 ; WX 605 ; N eta ; B 9 -231 529 474 ;
+C 18 ; WX 550 ; N theta ; B 50 -13 501 696 ;
+C 19 ; WX 330 ; N iota ; B 65 -13 318 461 ;
+C 20 ; WX 608 ; N kappa ; B 17 0 579 486 ;
+C 21 ; WX 495 ; N lambda ; B 12 -13 486 708 ;
+C 22 ; WX 605 ; N mu ; B 49 -215 587 461 ;
+C 23 ; WX 495 ; N nu ; B 9 -13 472 474 ;
+C 24 ; WX 495 ; N xi ; B 36 -191 467 727 ;
+C 25 ; WX 605 ; N pi ; B 26 -13 570 498 ;
+C 26 ; WX 550 ; N rho ; B 43 -231 508 474 ;
+C 27 ; WX 550 ; N sigma ; B 34 -13 537 474 ;
+C 28 ; WX 440 ; N tau ; B 8 -13 423 499 ;
+C 29 ; WX 550 ; N upsilon ; B 8 -13 491 474 ;
+C 30 ; WX 660 ; N phi ; B 44 -211 617 676 ;
+C 31 ; WX 495 ; N chi ; B 9 -211 486 474 ;
+C 32 ; WX 693 ; N psi ; B 13 -216 680 488 ;
+C 33 ; WX 715 ; N omega ; B 35 -13 680 474 ;
+C 34 ; WX 440 ; N epsilon ; B 36 -13 431 474 ;
+C 35 ; WX 605 ; N uni03D1 ; B 8 -13 592 727 ;
+C 36 ; WX 715 ; N uni03D6 ; B 25 -13 680 547 ;
+C 37 ; WX 550 ; N uni03F1 ; B 43 -240 508 474 ;
+C 38 ; WX 513 ; N uni03C2 ; B 24 -178 487 457 ;
+C 39 ; WX 660 ; N uni03D5 ; B 39 -211 622 474 ;
+C 40 ; WX 520 ; N nu1 ; B 25 -12 486 446 ;
+C 41 ; WX 550 ; N kappa1 ; B -23 -13 511 474 ;
+C 42 ; WX 550 ; N kappa1up ; B 28 -13 523 474 ;
+C 43 ; WX 627 ; N uni2207 ; B 24 0 603 676 ;
+C 44 ; WX 333 ; N colon ; B 82 -13 251 472 ;
+C 45 ; WX 333 ; N semicolon ; B 82 -180 266 472 ;
+C 46 ; WX 278 ; N slash ; B -24 -19 302 691 ;
+C 47 ; WX 500 ; N question ; B 57 -13 445 689 ;
+C 49 ; WX 530 ; N g1 ; B 1 -207 501 462 ;
+C 50 ; WX 537 ; N y1 ; B -12 -207 508 462 ;
+C 51 ; WX 421 ; N v1 ; B 15 -9 392 462 ;
+C 52 ; WX 649 ; N w1 ; B 15 -9 620 462 ;
+C 54 ; WX 676 ; N npropersubset ; B 52 -122 624 636 ;
+C 55 ; WX 676 ; N npropersuperset ; B 52 -122 624 636 ;
+C 56 ; WX 576 ; N nelement ; B 52 -122 524 636 ;
+C 57 ; WX 576 ; N nowner ; B 52 -122 524 636 ;
+C 58 ; WX 947 ; N colonequal ; B 82 14 885 500 ;
+C 59 ; WX 947 ; N equalcolon ; B 62 14 865 500 ;
+C 60 ; WX 676 ; N nequal ; B 62 -72 614 586 ;
+C 61 ; WX 676 ; N equal ; B 62 87 614 427 ;
+C 64 ; WX 565 ; N partialdiff.up ; B 21 -16 532 692 ;
+C 65 ; WX 712 ; N A ; B 51 -18 690 692 ;
+C 66 ; WX 712 ; N B ; B 49 -16 687 688 ;
+C 67 ; WX 663 ; N C ; B 73 -17 634 691 ;
+C 68 ; WX 663 ; N D ; B 48 -17 635 688 ;
+C 69 ; WX 663 ; N E ; B 60 -17 650 692 ;
+C 70 ; WX 614 ; N F ; B 35 -173 601 692 ;
+C 71 ; WX 762 ; N G ; B 72 -18 718 691 ;
+C 72 ; WX 712 ; N H ; B 31 -173 674 691 ;
+C 73 ; WX 614 ; N I ; B 28 -20 580 691 ;
+C 74 ; WX 614 ; N J ; B 15 -173 579 692 ;
+C 75 ; WX 712 ; N K ; B 13 -23 695 691 ;
+C 76 ; WX 564 ; N L ; B 30 -20 528 691 ;
+C 77 ; WX 921 ; N M ; B 15 -24 904 692 ;
+C 78 ; WX 762 ; N N ; B 50 -20 746 692 ;
+C 79 ; WX 663 ; N O ; B 66 -16 647 691 ;
+C 80 ; WX 712 ; N P ; B 45 -173 712 692 ;
+C 81 ; WX 722 ; N Q ; B 49 -20 711 690 ;
+C 82 ; WX 762 ; N R ; B 47 -20 743 692 ;
+C 83 ; WX 663 ; N S ; B 59 -14 638 692 ;
+C 84 ; WX 614 ; N T ; B 67 -17 600 689 ;
+C 85 ; WX 663 ; N U ; B 30 -21 642 691 ;
+C 86 ; WX 712 ; N V ; B 41 -18 709 691 ;
+C 87 ; WX 921 ; N W ; B 36 -13 920 686 ;
+C 88 ; WX 614 ; N X ; B 30 -15 610 691 ;
+C 89 ; WX 712 ; N Y ; B 47 -173 670 691 ;
+C 90 ; WX 623 ; N Z ; B 19 -173 571 690 ;
+C 97 ; WX 475 ; N a ; B 60 -9 465 510 ;
+C 98 ; WX 495 ; N b ; B 41 -16 448 674 ;
+C 99 ; WX 347 ; N c ; B 58 -7 336 513 ;
+C 100 ; WX 504 ; N d ; B 49 -8 457 681 ;
+C 101 ; WX 396 ; N e ; B 47 -10 390 514 ;
+C 102 ; WX 356 ; N f ; B 41 -158 331 682 ;
+C 103 ; WX 455 ; N g ; B 41 -159 443 509 ;
+C 104 ; WX 495 ; N h ; B 35 -158 450 682 ;
+C 105 ; WX 297 ; N i ; B 21 -10 287 683 ;
+C 106 ; WX 307 ; N j ; B 33 -160 275 682 ;
+C 107 ; WX 356 ; N k ; B 49 -8 328 682 ;
+C 108 ; WX 297 ; N l ; B 49 -9 289 680 ;
+C 109 ; WX 782 ; N m ; B 26 -9 760 510 ;
+C 110 ; WX 515 ; N n ; B 2 -7 515 512 ;
+C 111 ; WX 455 ; N o ; B 38 -8 432 522 ;
+C 112 ; WX 524 ; N p ; B 34 -159 480 517 ;
+C 113 ; WX 465 ; N q ; B 51 -159 435 522 ;
+C 114 ; WX 396 ; N r ; B 39 -8 393 518 ;
+C 115 ; WX 446 ; N s ; B 57 -4 408 515 ;
+C 116 ; WX 307 ; N t ; B 22 -10 301 669 ;
+C 117 ; WX 504 ; N u ; B 23 -10 503 516 ;
+C 118 ; WX 495 ; N v ; B 27 -4 453 509 ;
+C 119 ; WX 712 ; N w ; B 30 -6 674 519 ;
+C 120 ; WX 406 ; N x ; B 20 -8 396 510 ;
+C 121 ; WX 455 ; N y ; B 24 -158 425 509 ;
+C 122 ; WX 356 ; N z ; B 34 -160 328 514 ;
+C 127 ; WX 265 ; N tie ; B 214 516 626 678 ;
+C 129 ; WX 822 ; N bbA ; B 15 0 806 674 ;
+C 130 ; WX 777 ; N bbB ; B 17 0 703 662 ;
+C 131 ; WX 667 ; N bbC ; B 28 -14 633 676 ;
+C 132 ; WX 822 ; N bbD ; B 16 0 785 662 ;
+C 133 ; WX 711 ; N bbE ; B 12 0 697 662 ;
+C 134 ; WX 656 ; N bbF ; B 12 0 646 662 ;
+C 135 ; WX 722 ; N bbG ; B 32 -14 709 676 ;
+C 136 ; WX 822 ; N bbH ; B 19 0 802 662 ;
+C 137 ; WX 433 ; N bbI ; B 18 0 415 662 ;
+C 138 ; WX 489 ; N bbJ ; B 10 -14 470 662 ;
+C 139 ; WX 822 ; N bbK ; B 34 0 823 662 ;
+C 140 ; WX 711 ; N bbL ; B 12 0 698 662 ;
+C 141 ; WX 989 ; N bbM ; B 12 0 963 662 ;
+C 142 ; WX 822 ; N bbN ; B 12 -11 807 662 ;
+C 143 ; WX 722 ; N bbO ; B 34 -14 688 676 ;
+C 144 ; WX 656 ; N bbP ; B 16 0 642 662 ;
+C 145 ; WX 722 ; N bbQ ; B 34 -178 701 676 ;
+C 146 ; WX 767 ; N bbR ; B 17 0 759 662 ;
+C 147 ; WX 556 ; N bbS ; B 42 -14 491 676 ;
+C 148 ; WX 711 ; N bbT ; B 17 0 693 662 ;
+C 149 ; WX 822 ; N bbU ; B 14 -15 805 662 ;
+C 150 ; WX 822 ; N bbV ; B 16 -11 797 662 ;
+C 151 ; WX 1044 ; N bbW ; B 5 -11 1032 662 ;
+C 152 ; WX 822 ; N bbX ; B 10 0 804 662 ;
+C 153 ; WX 722 ; N bbY ; B 22 0 703 662 ;
+C 154 ; WX 731 ; N bbZ ; B 9 0 717 662 ;
+C 171 ; WX 600 ; N bbk ; B 7 0 605 683 ;
+C 186 ; WX 333 ; N caron ; B -2 528 335 704 ;
+C 187 ; WX 333 ; N breve ; B 15 528 318 691 ;
+C 219 ; WX 333 ; N tilde ; B -16 547 349 674 ;
+C 221 ; WX 333 ; N macron ; B 1 565 331 637 ;
+C 222 ; WX 333 ; N ring ; B 60 537 273 750 ;
+C 223 ; WX 333 ; N circumflex ; B -2 528 335 704 ;
+C 251 ; WX 561 ; N dblbracketleft ; B 88 -193 527 717 ;
+C 252 ; WX 561 ; N dblbracketright ; B 34 -193 473 717 ;
+C 253 ; WX 570 ; N plus ; B 33 0 537 506 ;
+C 254 ; WX 333 ; N grave ; B 8 528 246 713 ;
+C 255 ; WX 333 ; N acute ; B 86 528 324 713 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/newtx/txmiaX.afm b/Master/texmf-dist/fonts/afm/public/newtx/txmiaX.afm
new file mode 100644
index 00000000000..2c26fe5247d
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/newtx/txmiaX.afm
@@ -0,0 +1,214 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20170730
+Comment Creation Date: Tue Apr 17 15:59:17 2018
+FontName txmiaX
+FullName txmiaX
+FamilyName txmiaX
+Weight Medium
+Notice (Version 3.1, GPL)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 3.1
+EncodingScheme FontSpecific
+FontBBox -400 -243 975 794
+CapHeight 671
+XHeight 451
+Ascender 637
+Descender -212
+StartCharMetrics 192
+C 0 ; WX 556 ; N Gamma ; B 12 0 546 662 ;
+C 1 ; WX 643 ; N Delta ; B 24 0 618 677 ;
+C 2 ; WX 722 ; N Theta ; B 34 -14 688 676 ;
+C 3 ; WX 722 ; N Lambda ; B 16 0 697 673 ;
+C 4 ; WX 643 ; N Xi ; B 39 0 604 662 ;
+C 5 ; WX 722 ; N Pi ; B 18 0 704 662 ;
+C 6 ; WX 582 ; N Sigma ; B 16 0 556 662 ;
+C 7 ; WX 696 ; N Upsilon ; B 41 0 677 672 ;
+C 8 ; WX 731 ; N Phi ; B 35 0 696 662 ;
+C 9 ; WX 738 ; N Psi ; B 12 0 727 670 ;
+C 10 ; WX 743 ; N Omega ; B 29 0 714 677 ;
+C 11 ; WX 587 ; N alpha ; B 41 -10 558 461 ;
+C 12 ; WX 534 ; N beta ; B 59 -224 492 705 ;
+C 13 ; WX 480 ; N gamma ; B 19 -224 461 461 ;
+C 14 ; WX 534 ; N delta ; B 44 -10 490 705 ;
+C 15 ; WX 390 ; N uni03F5 ; B 25 -3 387 458 ;
+C 16 ; WX 480 ; N zeta ; B 41 -173 458 711 ;
+C 17 ; WX 534 ; N eta ; B 19 -224 475 461 ;
+C 18 ; WX 534 ; N theta ; B 51 -10 483 672 ;
+C 19 ; WX 267 ; N iota ; B 59 -10 265 451 ;
+C 20 ; WX 527 ; N kappa ; B 32 0 536 481 ;
+C 21 ; WX 480 ; N lambda ; B 26 -10 466 705 ;
+C 22 ; WX 534 ; N mu ; B 59 -224 515 451 ;
+C 23 ; WX 480 ; N nu ; B 15 0 455 461 ;
+C 24 ; WX 480 ; N xi ; B 25 -184 455 711 ;
+C 25 ; WX 587 ; N pi ; B 35 -10 552 470 ;
+C 26 ; WX 534 ; N rho ; B 44 -221 481 461 ;
+C 27 ; WX 534 ; N sigma ; B 41 -10 525 479 ;
+C 28 ; WX 426 ; N tau ; B 9 -10 402 468 ;
+C 29 ; WX 534 ; N upsilon ; B 19 -10 465 461 ;
+C 30 ; WX 640 ; N phi ; B 43 -224 597 662 ;
+C 31 ; WX 480 ; N chi ; B 19 -209 461 461 ;
+C 32 ; WX 658 ; N psi ; B 12 -199 646 471 ;
+C 33 ; WX 693 ; N omega ; B 41 -10 652 461 ;
+C 34 ; WX 426 ; N epsilon ; B 41 -10 399 461 ;
+C 35 ; WX 587 ; N uni03D1 ; B 17 -10 569 705 ;
+C 36 ; WX 684 ; N uni03D6 ; B 18 -10 653 521 ;
+C 37 ; WX 534 ; N uni03F1 ; B 41 -224 481 461 ;
+C 38 ; WX 473 ; N uni03C2 ; B 24 -178 447 457 ;
+C 39 ; WX 640 ; N uni03D5 ; B 40 -224 600 461 ;
+C 40 ; WX 460 ; N nu.alt ; B 25 -12 427 442 ;
+C 41 ; WX 534 ; N u1D718 ; B 5 -10 481 461 ;
+C 42 ; WX 534 ; N uni03F0 ; B 27 -10 500 461 ;
+C 43 ; WX 643 ; N uni2207 ; B 24 0 618 677 ;
+C 44 ; WX 278 ; N colon ; B 81 -11 192 459 ;
+C 45 ; WX 278 ; N semicolon ; B 80 -141 219 459 ;
+C 46 ; WX 278 ; N slash ; B -9 -14 287 676 ;
+C 47 ; WX 444 ; N question ; B 68 -8 414 676 ;
+C 49 ; WX 480 ; N g1 ; B 24 -207 448 439 ;
+C 50 ; WX 460 ; N y1 ; B 22 -207 442 441 ;
+C 51 ; WX 393 ; N v1 ; B 42 -11 375 441 ;
+C 52 ; WX 626 ; N w1 ; B 42 -11 608 441 ;
+C 54 ; WX 636 ; N npropersubset ; B 52 -102 584 616 ;
+C 55 ; WX 636 ; N npropersuperset ; B 52 -102 584 616 ;
+C 56 ; WX 536 ; N nelement ; B 52 -102 484 616 ;
+C 57 ; WX 536 ; N nowner ; B 52 -102 484 616 ;
+C 58 ; WX 847 ; N colonequal ; B 81 22 785 492 ;
+C 59 ; WX 847 ; N equalcolon ; B 62 22 766 492 ;
+C 60 ; WX 636 ; N nequal ; B 62 -52 574 566 ;
+C 61 ; WX 592 ; N equal ; B 40 127 552 386 ;
+C 64 ; WX 512 ; N partialdiff.up ; B 9 -16 448 692 ;
+C 65 ; WX 696 ; N u1D504 ; B 20 -19 673 704 ;
+C 66 ; WX 800 ; N u1D505 ; B 60 -22 746 703 ;
+C 67 ; WX 644 ; N uni212D ; B 52 -19 628 702 ;
+C 68 ; WX 800 ; N u1D507 ; B 69 -19 744 692 ;
+C 69 ; WX 644 ; N u1D508 ; B 54 -19 628 702 ;
+C 70 ; WX 696 ; N u1D509 ; B 74 -171 662 698 ;
+C 71 ; WX 800 ; N u1D50A ; B 88 -19 738 704 ;
+C 72 ; WX 696 ; N uni210C ; B 29 -181 655 702 ;
+C 73 ; WX 644 ; N Ifraktur ; B 12 -19 592 704 ;
+C 74 ; WX 644 ; N u1D50D ; B -1 -177 585 702 ;
+C 75 ; WX 696 ; N u1D50E ; B 2 -19 657 699 ;
+C 76 ; WX 644 ; N u1D50F ; B 37 -19 602 702 ;
+C 77 ; WX 955 ; N u1D510 ; B 10 -19 933 697 ;
+C 78 ; WX 747 ; N u1D511 ; B 16 -21 714 699 ;
+C 79 ; WX 800 ; N u1D512 ; B 42 -19 752 691 ;
+C 80 ; WX 800 ; N u1D513 ; B 37 -178 713 704 ;
+C 81 ; WX 800 ; N u1D514 ; B 41 -19 798 690 ;
+C 82 ; WX 747 ; N Rfraktur ; B 17 -19 700 700 ;
+C 83 ; WX 800 ; N u1D516 ; B 103 -19 755 690 ;
+C 84 ; WX 696 ; N u1D517 ; B 42 -19 687 691 ;
+C 85 ; WX 696 ; N u1D518 ; B 49 -19 681 703 ;
+C 86 ; WX 800 ; N u1D519 ; B 48 -19 704 697 ;
+C 87 ; WX 955 ; N u1D51A ; B 25 -13 928 696 ;
+C 88 ; WX 644 ; N u1D51B ; B 29 -19 628 702 ;
+C 89 ; WX 747 ; N u1D51C ; B 19 -180 639 702 ;
+C 90 ; WX 696 ; N uni2128 ; B -7 -185 607 693 ;
+C 91 ; WX 269 ; N u1D526.dtls ; B 32 -19 257 485 ;
+C 92 ; WX 269 ; N u1D527.dtls ; B 32 -184 229 488 ;
+C 97 ; WX 477 ; N u1D51E ; B 67 -21 468 488 ;
+C 98 ; WX 477 ; N u1D51F ; B 23 -24 435 666 ;
+C 99 ; WX 373 ; N u1D520 ; B 85 -19 355 484 ;
+C 100 ; WX 477 ; N u1D521 ; B 54 -19 446 679 ;
+C 101 ; WX 426 ; N u1D522 ; B 78 -20 391 487 ;
+C 102 ; WX 322 ; N u1D523 ; B 27 -177 292 702 ;
+C 103 ; WX 477 ; N u1D524 ; B 54 -178 442 489 ;
+C 104 ; WX 477 ; N u1D525 ; B 25 -180 437 679 ;
+C 105 ; WX 269 ; N u1D526 ; B 32 -19 257 686 ;
+C 106 ; WX 269 ; N u1D527 ; B 32 -184 229 689 ;
+C 107 ; WX 322 ; N u1D528 ; B 21 -19 308 685 ;
+C 108 ; WX 269 ; N u1D529 ; B 42 -20 265 679 ;
+C 109 ; WX 800 ; N u1D52A ; B 24 -19 772 483 ;
+C 110 ; WX 529 ; N u1D52B ; B 16 -19 517 483 ;
+C 111 ; WX 477 ; N u1D52C ; B 69 -19 446 486 ;
+C 112 ; WX 529 ; N u1D52D ; B 68 -176 495 489 ;
+C 113 ; WX 477 ; N u1D52E ; B 66 -183 454 483 ;
+C 114 ; WX 373 ; N u1D52F ; B 17 -19 361 488 ;
+C 115 ; WX 426 ; N u1D530 ; B 56 -21 408 484 ;
+C 116 ; WX 322 ; N u1D531 ; B 19 -21 292 679 ;
+C 117 ; WX 529 ; N u1D532 ; B 25 -19 511 485 ;
+C 118 ; WX 477 ; N u1D533 ; B 28 -19 433 480 ;
+C 119 ; WX 747 ; N u1D534 ; B 46 -19 707 485 ;
+C 120 ; WX 426 ; N u1D535 ; B 30 -19 401 487 ;
+C 121 ; WX 529 ; N u1D536 ; B 36 -178 464 489 ;
+C 122 ; WX 373 ; N u1D537 ; B 39 -180 343 489 ;
+C 127 ; WX 260 ; N tie ; B 222 492 613 650 ;
+C 129 ; WX 759 ; N u1D538 ; B 51 0 707 678 ;
+C 130 ; WX 692 ; N u1D539 ; B 71 0 641 678 ;
+C 131 ; WX 722 ; N uni2102 ; B 46 -15 679 692 ;
+C 132 ; WX 739 ; N u1D53B ; B 71 0 693 678 ;
+C 133 ; WX 637 ; N u1D53C ; B 71 0 580 678 ;
+C 134 ; WX 600 ; N u1D53D ; B 71 0 580 678 ;
+C 135 ; WX 723 ; N u1D53E ; B 46 -14 680 692 ;
+C 136 ; WX 735 ; N uni210D ; B 71 0 663 678 ;
+C 137 ; WX 329 ; N u1D540 ; B 80 0 250 678 ;
+C 138 ; WX 573 ; N u1D541 ; B 41 -15 507 678 ;
+C 139 ; WX 752 ; N u1D542 ; B 71 0 746 690 ;
+C 140 ; WX 605 ; N u1D543 ; B 71 0 584 678 ;
+C 141 ; WX 875 ; N u1D544 ; B 71 0 804 678 ;
+C 142 ; WX 715 ; N uni2115 ; B 71 0 643 678 ;
+C 143 ; WX 778 ; N u1D546 ; B 46 -15 732 692 ;
+C 144 ; WX 694 ; N uni2119 ; B 71 0 643 678 ;
+C 145 ; WX 783 ; N uni211A ; B 46 -67 732 692 ;
+C 146 ; WX 765 ; N uni211D ; B 71 0 729 678 ;
+C 147 ; WX 651 ; N u1D54A ; B 36 -15 611 692 ;
+C 148 ; WX 657 ; N u1D54B ; B 20 0 637 678 ;
+C 149 ; WX 715 ; N u1D54C ; B 66 -15 648 678 ;
+C 150 ; WX 676 ; N u1D54D ; B 10 0 666 678 ;
+C 151 ; WX 990 ; N u1D54E ; B 15 0 975 678 ;
+C 152 ; WX 786 ; N u1D54F ; B 36 0 750 678 ;
+C 153 ; WX 719 ; N u1D550 ; B 15 0 704 678 ;
+C 154 ; WX 744 ; N uni2124 ; B 51 0 693 678 ;
+C 155 ; WX 574 ; N u1D552 ; B 46 -10 518 471 ;
+C 156 ; WX 578 ; N u1D553 ; B 51 -10 536 699 ;
+C 157 ; WX 532 ; N u1D554 ; B 46 -10 486 471 ;
+C 158 ; WX 588 ; N u1D555 ; B 46 -10 531 699 ;
+C 159 ; WX 535 ; N u1D556 ; B 46 -10 489 471 ;
+C 160 ; WX 449 ; N u1D557 ; B 25 0 441 699 ;
+C 161 ; WX 588 ; N u1D558 ; B 46 -223 531 471 ;
+C 162 ; WX 557 ; N u1D559 ; B 56 0 500 699 ;
+C 163 ; WX 264 ; N u1D55A ; B 56 0 208 699 ;
+C 164 ; WX 312 ; N u1D55B ; B -16 -222 256 699 ;
+C 165 ; WX 564 ; N u1D55C ; B 51 0 552 699 ;
+C 166 ; WX 264 ; N u1D55D ; B 56 0 208 699 ;
+C 167 ; WX 850 ; N u1D55E ; B 56 0 793 471 ;
+C 168 ; WX 557 ; N u1D55F ; B 56 0 500 471 ;
+C 169 ; WX 566 ; N u1D560 ; B 46 -13 520 469 ;
+C 170 ; WX 588 ; N u1D561 ; B 56 -223 541 471 ;
+C 171 ; WX 588 ; N u1D562 ; B 46 -223 531 471 ;
+C 172 ; WX 432 ; N u1D563 ; B 56 0 417 474 ;
+C 173 ; WX 531 ; N u1D564 ; B 37 -10 494 471 ;
+C 174 ; WX 337 ; N u1D565 ; B 20 -10 304 648 ;
+C 175 ; WX 557 ; N u1D566 ; B 56 -10 500 461 ;
+C 176 ; WX 504 ; N u1D567 ; B 20 0 490 461 ;
+C 177 ; WX 724 ; N u1D568 ; B 20 0 711 461 ;
+C 178 ; WX 573 ; N u1D569 ; B 30 0 542 461 ;
+C 179 ; WX 538 ; N u1D56A ; B 20 -223 522 461 ;
+C 180 ; WX 531 ; N u1D56B ; B 44 0 487 461 ;
+C 186 ; WX 333 ; N caron ; B 11 507 322 674 ;
+C 187 ; WX 333 ; N breve ; B 26 507 307 664 ;
+C 219 ; WX 333 ; N tilde ; B 1 532 331 638 ;
+C 221 ; WX 333 ; N macron ; B 11 547 322 601 ;
+C 222 ; WX 333 ; N ring ; B 67 512 266 711 ;
+C 223 ; WX 333 ; N circumflex ; B 11 507 322 674 ;
+C 224 ; WX 0 ; N uni0300 ; B -338 521 -176 674 ;
+C 225 ; WX 0 ; N uni0301 ; B -284 521 -121 674 ;
+C 226 ; WX 0 ; N uni0302 ; B -371 521 -89 674 ;
+C 227 ; WX 0 ; N uni0303 ; B -386 533 -65 642 ;
+C 228 ; WX 0 ; N uni0304 ; B -375 555 -85 610 ;
+C 229 ; WX 0 ; N uni0305 ; B -400 555 0 610 ;
+C 230 ; WX 0 ; N uni0306 ; B -377 529 -84 683 ;
+C 231 ; WX 0 ; N uni0307 ; B -286 551 -174 660 ;
+C 232 ; WX 0 ; N uni0308 ; B -396 551 -65 661 ;
+C 233 ; WX 0 ; N uni0309 ; B -307 521 -125 729 ;
+C 234 ; WX 0 ; N uni030A ; B -333 530 -128 729 ;
+C 235 ; WX 0 ; N uni030B ; B -325 521 -35 674 ;
+C 236 ; WX 0 ; N uni030C ; B -371 525 -89 678 ;
+C 251 ; WX 478 ; N dblbracketleft ; B 88 -243 444 757 ;
+C 252 ; WX 476 ; N dblbracketright ; B 34 -243 388 757 ;
+C 253 ; WX 564 ; N plus ; B 30 0 534 506 ;
+C 254 ; WX 333 ; N grave ; B 19 507 242 678 ;
+C 255 ; WX 333 ; N acute ; B 93 507 317 678 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map
index 3e18dbef395..8f7d66e9a1d 100644
--- a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map
+++ b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map
@@ -1,3 +1,7 @@
+stickstooMath-Italic stickstooMath-Italic <stickstooMath-Italic.pfb
+stickstooMath-BoldItalic stickstooMath-BoldItalic <stickstooMath-BoldItalic.pfb
+stickstooMath-Regular stickstooMath-Regular <stickstooMath-Regular.pfb
+stickstooMath-Bold stickstooMath-Bold <stickstooMath-Bold.pfb
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
@@ -64,6 +68,8 @@ txmia7 txmia7 <txmia7.pfb
txbmia7 txbmia7 <txbmia7.pfb
txmia5 txmia5 <txmia5.pfb
txbmia5 txbmia5 <txbmia5.pfb
+txmiaX txmiaX <txmiaX.pfb
+txbmiaX txbmiaX <txbmiaX.pfb
rntxmi rntxmi <rntxmi.pfb
rntxmi5 rntxmi5 <rntxmi5.pfb
rntxmi7 rntxmi7 <rntxmi7.pfb
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmi.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmi.tfm
new file mode 100644
index 00000000000..fe8deef5cfa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmi.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmia.tfm
new file mode 100644
index 00000000000..9f2652d7c59
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2bmia.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mi.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mi.tfm
new file mode 100644
index 00000000000..06abe0bd78b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mi.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mia.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mia.tfm
new file mode 100644
index 00000000000..e496f585a92
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntxstx2mia.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/stx2rm.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/stx2rm.tfm
new file mode 100644
index 00000000000..bd6f4c90b09
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/stx2rm.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/txbmiaX.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/txbmiaX.tfm
new file mode 100644
index 00000000000..e97aea96968
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/txbmiaX.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/txmiaX.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/txmiaX.tfm
new file mode 100644
index 00000000000..4d079d495dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/newtx/txmiaX.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/newtx/txbmiaX.pfb b/Master/texmf-dist/fonts/type1/public/newtx/txbmiaX.pfb
new file mode 100644
index 00000000000..c22d44f9012
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/newtx/txbmiaX.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/newtx/txmiaX.pfb b/Master/texmf-dist/fonts/type1/public/newtx/txmiaX.pfb
new file mode 100644
index 00000000000..bd530e39a82
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/newtx/txmiaX.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmi.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmi.vf
new file mode 100644
index 00000000000..73a1ec51f0c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmi.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmia.vf
new file mode 100644
index 00000000000..eb3fbff7851
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2bmia.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mi.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mi.vf
new file mode 100644
index 00000000000..7e8082d46dd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mi.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mia.vf b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mia.vf
new file mode 100644
index 00000000000..dcc9d36c5b9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/newtx/ntxstx2mia.vf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 845421d53b1..00243667ba9 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -10,16 +10,18 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.53}
-\def\filedate{2017/12/14}
+\def\fileversion{1.55}
+\def\filedate{2018/05/09}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
-\message{`newtxmath' v\fileversion, \filedate\space Math macros based on txfonts (msharpe)}
+\message{`newtxmath' v\fileversion, \filedate\space Math macros based originally on txfonts (msharpe)}
\csname newtxmathLoaded\endcsname
\let\newtxmathLoaded\endinput
\RequirePackage{amsmath} % improves extendable delimiter handling
+\RequirePackage{etoolbox}
+\RequirePackage{etextools} % for \ifiscs
\RequirePackage{ifxetex,ifluatex,xkeyval}
\RequirePackage{centernot} % for proper handling of negated relations
\newif\ifxl@otf \xl@otffalse
@@ -48,6 +50,7 @@
\DeclareOption{varg}{\def\X@s@v@rg{1}}
\DeclareOption{varvw}{\def\X@s@v@rg{0}}
\newcount\tx@Isdigit
+\newcount\tx@IsAlNum
\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@bigdelims
@@ -65,6 +68,8 @@
\newif\iftx@BI \tx@BIfalse
\def\@tx@ptm{ptm}
\newif\iftx@ptm
+\newif\iftx@nozchvw
+\newif\iftx@stxtwo
%\show\rmdefault
\edef\tx@rmdefault{\rmdefault}
\edef\tx@encdefault{\encodingdefault}
@@ -117,9 +122,15 @@
\DeclareOption{upint}{\tx@upinttrue}
\DeclareOption{smallerops}{\tx@smopstrue}
\DeclareOption{useBImacros}{\tx@BItrue}
+\DeclareOption{noxchvw}{\tx@nozchvwtrue}
+\DeclareOption{noXchvw}{\tx@nozchvwtrue}
+\DeclareOption{stix2}{\tx@stxtwotrue} % added in 1.55
+\DeclareOption{stickstoo}{\tx@stxtwotrue} % added in 1.55
\ExecuteOptions{%
amssymbols,uprightGreek,nosubscriptcorrection}
\ProcessOptions*
+% stix2 forces timesmathacc and no optical sizes
+\iftx@stxtwo\tx@tmatrue \tx@noopttrue\fi
% frenchmath implies uprightGreek
\iftx@frenchm\tx@slantedGfalse\fi
@@ -134,6 +145,7 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\iftx@gm\let\X@s@v@rg\@undefined\fi
\iftx@bv\let\X@s@v@rg\@undefined\fi
\iftx@ba\let\X@s@v@rg\@undefined\fi
+\iftx@stxtwo\let\X@s@v@rg\@undefined\fi
% altnu, liby and largelibfigs valid only with libertine
\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\tx@libyfalse\fi
% Use existing text fonts for operators, mathrm, etc
@@ -158,6 +170,8 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\def\operator@font{\mathgroup\symoperators}
+%\show\ttdefault
+
\DeclareSymbolFontAlphabet{\mathrm}{operators}
\DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n}
@@ -218,9 +232,15 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\SetSymbolFont{letters}{bold}{OML}{zbami}{b}{it}
\DeclareFontSubstitution{OML}{zbami}{m}{it}
\else
- \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
- \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \iftx@stxtwo
+ \DeclareSymbolFont{letters}{OML}{ntxstx2mi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{ntxstx2mi}{b}{it}
+ \DeclareFontSubstitution{OML}{ntxstx2mi}{m}{it}
+ \else
+ \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
+ \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \fi
\fi
\fi
\fi
@@ -357,15 +377,6 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\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%
-}
\DeclareRobustCommand{\BI@}[1]{%
\begingroup\text{\mathversion{bold}$#1$}\endgroup}
\iftx@BI
@@ -423,13 +434,44 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\DeclareRobustCommand{\BIz}{\BI@{z}}
\fi% end \iftx@BI
-\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\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@isAlNum#1{% #1 should be a single character
+\tx@IsAlNum=\z@ %
+\count0=\number`#1\relax%
+\ifnum\count0>47\relax%
+ \ifnum\count0<58\relax%
+ \tx@IsAlNum=\@ne %
+ \else
+ \ifnum\count0>64\relax%
+ \ifnum\count0<91\relax%
+ \tx@IsAlNum=\tw@ %
+ \else
+ \ifnum\count0>96\relax%
+ \ifnum\count0<123\relax%
+ \tx@IsAlNum=3\relax %
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+\fi
+}
-\def\equalht#1{\tx@XXX #1\@nil}
+%\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}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Subscript correction code
@@ -630,6 +672,7 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\re@DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10}
\fi
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Symbol (txsy) Definition % symbols
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1525,8 +1568,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\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}}}
-\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char127}}}
+%\def\dlb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char126}}}
+%\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{txsyc}{m}{n}\char127}}}
+\let\dlb\llbracket
+\let\drb\rrbracket
% Changes to put some symbolsC glyphs into lettersA
\re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{54}
@@ -1634,8 +1679,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
% \re@DeclareMathSymbol{\varkappa}{\mathord}{AMSm}{123}
% \re@DeclareMathSymbol{\varkappaup}{\mathord}{AMSm}{123}
%\else
- \re@DeclareMathSymbol{\varkappa}{\mathord}{lettersA}{41}
+ \re@DeclareMathSymbol{\varkappait}{\mathord}{lettersA}{41}
+ \let\varkappa\varkappait
\re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{42}
+
%\fi
% upright Greek
\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{0}
@@ -1787,10 +1834,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\varv}{\mathord}{lettersA}{51}
\re@DeclareMathSymbol{\varw}{\mathord}{lettersA}{52}
\re@DeclareMathSymbol{\nexists}{\mathord}{symbols}{"9A}
- \let\nexistsAlt=\exists
-\re@DeclareMathSymbol{\exists}{\mathord}{lettersA}{92}
+ \let\nexistsAlt=\nexists
+%\re@DeclareMathSymbol{\exists}{\mathord}{lettersA}{92}
\let\existsAlt=\exists
-\re@DeclareMathSymbol{\forall}{\mathord}{lettersA}{91}
+%\re@DeclareMathSymbol{\forall}{\mathord}{lettersA}{91}
\let\forallAlt=\forall
%\DeclareMathSymbol{\forallAlt}{\mathord}{lettersA}{91}%added 20130726
%\DeclareMathSymbol{\nexistsAlt}{\mathord}{lettersA}{93}%added 20130726
@@ -1841,13 +1888,41 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\DeclareMathSymbol{\uppartial}{\mathord}{lettersA}{64}%added 20120416
-\def\ntx@UC{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z}
-\def\ntx@lc{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-\def\ntx@num{0,1,2,3,4,5,6,7,8,9}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Special considerations for stix2
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Accents change, as do Bbb alphabets, some special symbols in mia
+\iftx@stxtwo %
+ \DeclareMathSymbol{\upnabla}{\mathord}{lettersA}{43}
+ \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{44}
+ \re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{45}
+ \re@DeclareMathSymbol{\notin}{\mathrel}{lettersA}{46}
+ \re@DeclareMathSymbol{\notni}{\mathrel}{lettersA}{47}
+ \let\notowns=\notni \let\nni=\notni
+ \re@DeclareMathSymbol{\coloneq}{\mathrel}{lettersA}{58}
+ \re@DeclareMathSymbol{\eqcolon}{\mathrel}{lettersA}{59}
+ \re@DeclareMathSymbol{\neq}{\mathrel}{lettersA}{60}
+ \let\ne=\neq
+ \re@DeclareMathAccent{\grave}{\mathord}{lettersA}{237}
+ \re@DeclareMathAccent{\acute}{\mathord}{lettersA}{238}
+ \re@DeclareMathAccent{\hat}{\mathord}{lettersA}{239}
+ \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{240}
+ \re@DeclareMathAccent{\bar}{\mathord}{lettersA}{241}
+ \re@DeclareMathAccent{\breve}{\mathord}{lettersA}{242}
+ \re@DeclareMathAccent{\dot}{\mathord}{lettersA}{243}
+ \re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{244}
+ \re@DeclareMathAccent{\mathring}{\mathord}{lettersA}{245}
+ \re@DeclareMathAccent{\check}{\mathord}{lettersA}{246}
+\fi
+
+%\def\ntx@UC{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z}
+%\def\ntx@lc{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+%\def\ntx@num{0,1,2,3,4,5,6,7,8,9}
%\@for\ntx@x:=\ntx@UC\do{\edef\ntx@tmp{\edef\csname
-%\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129}
+\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129}
\DeclareMathSymbol{\m@thbbch@rA}{\mathord}{lettersA}{129}
\DeclareMathSymbol{\m@thbbch@rB}{\mathord}{lettersA}{130}
\DeclareMathSymbol{\m@thbbch@rC}{\mathord}{lettersA}{131}
@@ -1888,12 +1963,13 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
}%
\futurelet\@FutureLetToken\@FutureLetDecide}% end DoFutureLet
+\def\F@ntPrefix{m@thbbch@r}
%\def\m@keCharacter#1{%
% \@tempcnta=`#1\relax \advance\@tempcnta "40\relax
% \edef\ntx@char{\ntx@lettersA\nhex{2}{\the\@tempcnta}}
% \expandafter\mathchar\ntx@char}
%\def\@PickUpTheCharacter#1{\m@keCharacter{#1}\DoFutureLet}
-%\def\@EachCharacterDone \@nil{}% cleanup---get rid of \@nil
+\def\@EachCharacterDone \@nil{}% cleanup---get rid of \@nil
%\newif\ifntx@notnil
%\def\@EachCharacter{%
% \DoFutureLet{\@EachCharacterDone}{\@PickUpTheCharacter}}
@@ -1904,35 +1980,132 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
%
%\DeclareRobustCommand*{\varmathbb}[1]{\gdef\F@ntPrefix{m@thbbch@r}%
% \@EachCharacter #1\@nil}
-\DeclareRobustCommand*{\varmathbb}[1]{\gdef\F@ntPrefix{m@thbbch@r}%
+\DeclareRobustCommand*{\varmathbb}[1]{%\gdef\F@ntPrefix{m@thbbch@r}%
\DoFutureLet #1\@nil}
-% Additional macros to access process a single character only, work with \bm
+% Changed macros which are not limited to a single character, and can include digits, \imath, \jmath
+%%%%%%
+% Experimental code May 8, 2018
+\newcount\ntx@numstart
+\newcount\ntx@UCstart
+\newcount\ntx@lcstart
+\newcount\ntx@tmpc
+\newcount\ntx@imath
+\newcount\ntx@jmath
+\newif\ifntx@notempty
+\def\ntx@fam{}
\def\ntx@char{}
-\DeclareRobustCommand*{\vmathbb}[1]{% for original variant bb
- \@tempcnta=`#1\relax \advance\@tempcnta "40\relax
- \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}}
- \expandafter\mathchar\ntx@char
-}
-\DeclareRobustCommand*{\vvmathbb}[1]{% for new (STIX) variant
- \@tempcnta=`#1\relax \advance\@tempcnta "80\relax
- \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}}
- \expandafter\mathchar\ntx@char
+\def\ntx@alfa#1#2#3#4#5#6#7{%#1=string, #2=UC,#3=lc,#4=imath,#5=jmath,#6=numstart,#7=fam
+ \ntx@UCstart=#2
+ %\gdef\xx{x#3x}
+ \@xp\ifblank\@xp{#3}{\ntx@lcstart=512 }{\ntx@lcstart=#3}
+ \@xp\ifblank\@xp{#4}{\ntx@imath=512 }{\ntx@imath=#4}
+ \@xp\ifblank\@xp{#5}{\ntx@jmath=512 }{\ntx@jmath=#5}
+ \@xp\ifblank\@xp{#6}{\ntx@numstart=512 }{\ntx@numstart=#6}
+ \def\ntx@fam{#7}
+ \@xp\ifblank\@xp{#1}{\relax}{\@xp\ntx@@alfa #1\@nil}}
+
+\def\ntx@@alfa#1#2\@nil{%
+ \ntx@out{#1}
+ \ifblank{#2}{\relax}{\ntx@@alfa #2\@nil}}
+
+\def\ntx@out#1{% #1 is always a single token---use values from \ntx@alfa
+ %\showthe\ntx@numstart
+ \ntx@tmpc=\z@
+ \ifx#1\imath\ntx@tmpc=128\relax
+ \ifnum\ntx@imath>255\relax #1\ntx@tmpc=256 \message{^^JNo imath in this alphabet^^J}\fi
+ \else % not \imath
+ \ifx#1\jmath\ntx@tmpc=129\relax
+ \ifnum\ntx@jmath>255\relax #1\ntx@tmpc=256 \message{^^JNo jmath in this alphabet^^J}\fi
+ \else % neither \imath nor \jmath
+ \ifiscs{#1}{#1\ntx@tmpc=256 }{% not a cs
+ \ntx@tmpc=\number\@xp`#1}
+ \fi
+ \fi
+ %\message{^^JCharacter index = \the\ntx@tmpc^^J}
+ \ifnum\ntx@tmpc<128\relax % neither \imath nor \jmath nor cs
+ \tx@isAlNum{#1}
+ %\message{^^JIsAlNum = \the\tx@IsAlNum^^J}
+ \ifnum\tx@IsAlNum=\@ne % it's a digit
+ \ifnum\ntx@numstart>255\relax #1\ntx@tmpc=256 \message{^^JNo digits in this alphabet^^J}
+ \else
+ \advance\ntx@tmpc -48 % 0..9
+ \advance\ntx@tmpc \ntx@numstart
+ \fi
+ \else
+ \ifnum\tx@IsAlNum=\tw@ % it's UC
+ \advance\ntx@tmpc -65 % 0..25
+ \advance\ntx@tmpc\ntx@UCstart
+ \else
+ \ifnum\tx@IsAlNum>\tw@ % it's lc
+ \ifnum\ntx@lcstart>255 #1\ntx@tmpc=256 \message{^^JNo lowercase in this alphabet^^J}
+ \else
+ %\message{^^JCharacter index = \the\ntx@tmpc^^J
+ %lcstart = \the\ntx@lcstart^^J}
+ \advance\ntx@tmpc -97 % 0..25
+ \advance\ntx@tmpc\ntx@lcstart
+ %\message{^^JCharacter index = \the\ntx@tmpc^^J}
+ \fi
+ \else % it must be a character outside alphanumerics
+ #1
+ \fi
+ \fi
+ \fi
+ \else % ntx@tmpc>127
+ \ifnum\ntx@tmpc=128\relax % imath
+ \ntx@tmpc=\ntx@imath
+ \else
+ \ifnum\ntx@tmpc=129\relax % jmath
+ \ntx@tmpc=\ntx@jmath
+ \fi
+ \fi
+ \fi
+ \ifnum\ntx@tmpc<256\relax
+ \def\ntx@char{"\@xp\hexnumber@\csname sym\ntx@fam\endcsname\nhex{2}{\the\ntx@tmpc}}
+ %\message{^^Joutput char = \ntx@char^^J}
+ \@xp\mathchar\ntx@char%\traceoff
+ \fi %end of ifnum <256
}
+% This really needs to be reorganized
+\iftx@stxtwo
+ \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{129}{155}{181}{182}{48}{lettersA}}
+ \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{183}{209}{235}{236}{48}{lettersA}}
+\else
+ \DeclareRobustCommand{\vmathbb}[1]{\ntx@alfa{#1}{129}{159}{}{}{}{lettersA}}
+ \DeclareRobustCommand{\vvmathbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{}{lettersA}}
+ %\DeclareRobustCommand{\vvmathbbb}[1]{\ntx@alfa{#1}{193}{225}{}{}{48}{boldlettersA}}
+\fi
+%%%%%%%%%%%
+%End experimental code
+%%%%%%%%%%%
+% Additional macros to access process a single character only, work with \bm
+%\def\ntx@char{}
+%\DeclareRobustCommand*{\vmathbb}[1]{% for original variant bb
+% \@tempcnta=`#1\relax \advance\@tempcnta "40\relax
+% \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}}
+% \expandafter\mathchar\ntx@char
+%}
+%\DeclareRobustCommand*{\vvmathbb}[1]{% for new (STIX) variant
+% \@tempcnta=`#1\relax \advance\@tempcnta "80\relax
+% \edef\ntx@char{"\hexnumber@\symlettersA\nhex{2}{\the\@tempcnta}}
+% \expandafter\mathchar\ntx@char
+%}
%\DeclareRobustCommand*{\vvmathbbb}[1]{% for new (STIX) variant
% \@tempcnta=`#1\relax \advance\@tempcnta "80\relax
% \edef\ntx@char{"\hexnumber@\symboldlettersA\nhex{2}{\the\@tempcnta}}
% \expandafter\mathchar\ntx@char
%}
+
\iftx@vvarbb
- \let\mathbb\vvmathbb
+ \let\mathbb\vvmathbb %\DeclareRobustCommand*{\mathbb}{\vvmathbb}
\else
\iftx@varbb
- \let\mathbb\varmathbb
+ \let\mathbb\vmathbb %\DeclareRobustCommand*{\mathbb}{\varmathbb}
\else
\iftx@ams\else\let\mathbb\varmathbb\fi
\fi
\fi
+%\show\mathbb
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Math Extension (ntxex) Definition % largesymbols
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd
new file mode 100644
index 00000000000..573645e86d1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/newtx/omlntxstx2mi.fd
@@ -0,0 +1,27 @@
+%Filename: omlntxstx2mi.fd
+%Created by: tex stx2-drv
+%Created using fontinst v1.933
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{omlntxstx2mi.fd}
+ [2018/04/26 Fontinst v1.933 font definitions for OML/ntxstx2mi.]
+
+\providecommand{\ntxmath@scaled}{}
+
+\DeclareFontFamily{OML}{ntxstx2mi}{\skewchar \font =127}
+
+\DeclareFontShape{OML}{ntxstx2mi}{m}{it}{
+ <-> \ntxmath@scaled ntxstx2mi
+}{}
+
+\DeclareFontShape{OML}{ntxstx2mi}{b}{it}{
+ <-> \ntxmath@scaled ntxstx2bmi
+}{}
+
+\DeclareFontShape{OML}{ntxstx2mi}{m}{sl}{<->ssub * ntxstx2mi/m/it}{}
+\DeclareFontShape{OML}{ntxstx2mi}{bx}{it}{<->ssub * ntxstx2mi/b/it}{}
+\DeclareFontShape{OML}{ntxstx2mi}{b}{sl}{<->ssub * ntxstx2mi/b/it}{}
+\DeclareFontShape{OML}{ntxstx2mi}{bx}{sl}{<->ssub * ntxstx2mi/b/sl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd
index 0802dfc7b5b..2ea2ebfcef6 100644
--- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd
+++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{untxmia.fd}
- [2016/01/31 Fontinst v1.933 font definitions for U/ntxmia.]
+ [2018/04/14 Fontinst v1.933 font definitions for U/ntxmia.]
\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
\let\ntxmath@scaled\@empty%
@@ -47,13 +47,22 @@
<-> \ntxmath@scaled zchbmia
}{}
\else
- \DeclareFontShape{U}{ntxmia}{m}{it}{
- <-> \ntxmath@scaled ntxmia
- }{}
-
- \DeclareFontShape{U}{ntxmia}{b}{it}{
- <-> \ntxmath@scaled ntxbmia
- }{}
+ \iftx@stxtwo
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxstx2mia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxstx2bmia
+ }{}
+
+ \else
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxbmia
+ }{}
+ \fi
\fi
\fi
\fi