diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/t1fxl1.fd | 67 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd | 28 |
5 files changed, 116 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 8d431793b3c..f973911fe69 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.02} -\def\filedate{2012/07/30} +\def\fileversion{1.03} +\def\filedate{2012/08/13} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{ntxmathLoaded}{}{\endinput} @@ -225,8 +225,18 @@ amssymbols,uprightGreek} %\DeclareMathAccent{\mathring}{\mathalpha}{operators}{23} %\DeclareMathSymbol{\mathdollar}{\mathord}{operators}{36} %\def\mathsterling{\mathit{\mathchar"7024}} +%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} + \fi +\fi %\DeclareMathSymbol{+}{\mathbin}{operators}{43} %\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14} %\DeclareMathSymbol{:}{\mathrel}{operators}{58} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 535426a1ad4..9ca2877ba35 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.02} -\def\filedate{2012/07/30} +\def\fileversion{1.03} +\def\filedate{2012/08/13} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} @@ -37,7 +37,7 @@ \not@math@alphabet\sustyle\relax \fontfamily{ntxr1}\selectfont} -\def\@makefnmark{\hbox{\sustyle\@thefnmark}}% footnotemark from sups +\def\@makefnmark{\hbox{\sustyle\hspace*{.04em}\@thefnmark}}% footnotemark from sups %%%%%%%%%%%%%%%%%%%%%% % Text Serif (Times) % diff --git a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd index 261bed9fae7..91d54dd4016 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd @@ -13,18 +13,31 @@ \DeclareFontFamily{OML}{nxlmi}{\skewchar \font =127} -\DeclareFontShape{OML}{nxlmi}{m}{it}{ +\iftx@libaltvw % new v, w + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi15 + <6.3-8.6> \ntxmath@scaled nxlmi17 + <8.6-> \ntxmath@scaled nxlmi1 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi15 + <6.3-8.6> \ntxmath@scaled nxlbmi17 + <8.6-> \ntxmath@scaled nxlbmi1 + }{} +\else % original v, w + \DeclareFontShape{OML}{nxlmi}{m}{it}{ <-6.3> \ntxmath@scaled nxlmi5 <6.3-8.6> \ntxmath@scaled nxlmi7 <8.6-> \ntxmath@scaled nxlmi -}{} + }{} -\DeclareFontShape{OML}{nxlmi}{b}{it}{ + \DeclareFontShape{OML}{nxlmi}{b}{it}{ <-6.3> \ntxmath@scaled nxlbmi5 - <6.3-8.6> \ntxmath@scaled nxlbmi7 - <8.6-> \ntxmath@scaled nxlbmi -}{} - + <6.3-8.6> \ntxmath@scaled nxlbmi7 + <8.6-> \ntxmath@scaled nxlbmi + }{} +\fi \DeclareFontShape{OML}{nxlmi}{m}{sl}{<->ssub * nxlmi/m/it}{} \DeclareFontShape{OML}{nxlmi}{bx}{it}{<->ssub * nxlmi/b/it}{} \DeclareFontShape{OML}{nxlmi}{b}{sl}{<->ssub * nxlmi/b/it}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1fxl1.fd b/Master/texmf-dist/tex/latex/newtx/t1fxl1.fd new file mode 100644 index 00000000000..ef76c465e34 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/t1fxl1.fd @@ -0,0 +1,67 @@ +\ProvidesFile{t1fxl1.fd}[2012/07/30 T1/fxlr-sups] +\expandafter\ifx\csname fxl@scale\endcsname\relax + \let\fxl@@scale\@empty% +\else + \edef\fxl@@scale{s*[\csname fxl@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{fxl1}{} +\DeclareFontShape{T1}{fxl1}{m}{n}{ + <-> \fxl@@scale rfxlr-sups +}{} +\DeclareFontShape{T1}{fxl1}{b}{it}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{b}{n}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{z}{it}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{z}{n}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{m}{sc}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{b}{sc}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{z}{sc}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{m}{it}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{b}{sl}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{sb}{n}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{sb}{it}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{sb}{sc}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{sb}{sl}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{z}{sl}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{m}{sl}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{bx}{it}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{bx}{n}{ + <-> ssub * fxl1/m/n +}{} +\DeclareFontShape{T1}{fxl1}{bx}{sl}{ + <-> ssub * fxl1/m/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd index e5f4c1897dc..c23c269ab18 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd @@ -8,45 +8,45 @@ <-> \ntx@scaled ntxsups% }{} \DeclareFontShape{T1}{ntxr1}{m}{sc}{ %cap & small cap - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{m}{sl}{ %slanted - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{m}{it}{ %italic - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{m}{ui}{ %unslanted italic - <->ssub * ntxr/m/it% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{bx}{n}{ %bold extended - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{bx}{sc}{ %bold extended cap & small cap - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{bx}{sl}{ %bold extended slanted - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{bx}{it}{ %bold extended italic - <-> \ntx@scaled ntxsups% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{bx}{ui}{ %bold extended unslanted italic - <->ssub * ntxr1/bx/it% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{b}{n}{ %bold - <->ssub * ntxr1/bx/n% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{b}{sc}{ %bold cap & small cap - <->ssub * ntxr1/bx/sc% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{b}{sl}{ %bold slanted - <->ssub * ntxr1/bx/sl% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{b}{it}{ %bold italic - <->ssub * ntxr1/bx/it% + <-> ssub * ntxr/m/n% }{} \DeclareFontShape{T1}{ntxr1}{b}{ui}{ %bold unslanted italic - <->ssub * ntxr1/bx/ui% + <-> ssub * ntxr/m/n% }{} \endinput |