diff options
Diffstat (limited to 'Master')
48 files changed, 225 insertions, 330 deletions
diff --git a/Master/texmf-dist/doc/fonts/newtx/README b/Master/texmf-dist/doc/fonts/newtx/README index bcf1e586b66..1bc267f8d88 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.401, 02/03/2015 +Current version: 1.41, 02/13/2015 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.41 +1. Added italic "theorem font" for statements of theorems with upright punctuation and figures. +2. Added upright version of \varkappa. +3. Updated documentation. + Changes in version 1.401 Include fd files inadvertently omitted from version 1.4. diff --git a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf Binary files differindex 25e85360729..db004ab560d 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 dacdc65d200..c16d2ff836e 100644 --- a/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex @@ -6,12 +6,25 @@ \usepackage{url} %SetFonts % newtxtext text and newtxmath -%\usepackage{lmodern} -\pdfmapfile{+newtxtext} -\usepackage[osf,largesc]{newtxtext} +\usepackage{amsthm} +\newtheoremstyle{oldplain} + {\topsep} % ABOVESPACE + {\topsep} % BELOWSPACE + {\itshape} % BODYFONT + {} % INDENT (empty value is the same as 0pt) + {\bfseries} % HEADFONT + {.} % HEADPUNCT + {5pt plus 1pt minus 1pt} % HEADSPACE + {} % CUSTOM-HEAD-SPEC +\theoremstyle{oldplain} +\newtheorem{oldthm}{Theorem}[section] +\theoremstyle{plain} +\newtheorem{thm}{Theorem}[section] +\pdfmapfile{=newtx.map} +\usepackage[osf,largesc,theoremfont]{newtxtext} \usepackage[T1]{fontenc} \usepackage[varqu,varl]{zi4} -\usepackage{amsmath,amsthm} +\usepackage{amsmath} \usepackage[bigdelims]{newtxmath} %\useosf \usepackage{bm} @@ -24,11 +37,11 @@ \begin{document} \maketitle \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. +This package is meant to be a replacement for Young Ryu's {\tt txfonts}. It is a complete text ({\tt newtxtext}) and math ({\tt newtxmath}) package with roman text font provided by 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. As of version 1.4, {\tt newtxtext} no longer depends on {\tt txfonts} but is based on the richer source \textsf{TeXGyre Termes}, but {\tt newtxmath} continues to use the {\tt txfonts} math glyphs with many metric adjustments and some wholesale modifications. -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 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 new package differs from {\tt txfonts} in the following ways: +The {\tt newtx} package differs from {\tt txfonts} in the following ways: \begin{itemize} \item the new package is split into separate text and math packages that do not need to be used in conjunction; @@ -43,9 +56,10 @@ the new package is split into separate text and math packages that do not need t \item The problem with the {\tt ogonek} accent and tabular environments (bad definition of \verb|\k|) is fixed; \item The default encoding for \textsf{newtxtext} is now T$1$, but support is offered also for OT$1$ and LY$1$. As some add-on packages are available only in T$1$, that seems the best current choice. \item Sans serif is by default taken from TeXGyreHeros, and by default at 90\% of the scale factor (set by {\tt scaled}, default value {\tt1}). The option {\tt helvratio=.98} will change that to 98\%. +\item \verb|\varkappa| $\varkappa$ has been moved from {\tt AMSb} to {\tt lettersA}, and is now accompanied by an upright form \verb|\upvarkappa| $\upvarkappa$ which behaves as it should when using the {\tt frenchmath} option. \end{itemize} \section{Text mode options} -Beginning with version 1.4, the text font component of \textsf{newtx} is no longer dependent on the txfonts, and is constructed entirely from \textsf{TeXGyre Termes} and some modifications thereof. +Beginning with version 1.4, the text font component of \textsf{newtx} is no longer dependent on the {\tt txfonts}, and is constructed entirely from \textsf{TeXGyre Termes} and some modifications thereof. The text mode environment invoked by \begin{verbatim} @@ -62,13 +76,38 @@ to load the roman and typewriter text fonts at 93\% of normal size, and the sans load roman and typewriter text fonts at 95\% of normal size, and the sans serif (\textsf{Helvetica} clone) at scale $0.95*0.96$. The option \texttt{osf} instructs the text fonts to use old-style figures \oldstylenums{1234567890} rather than the default lining figures $1234567890$. As of version $1.23$, {\tt newtxtext} loads initially with lining figures so the math package uses lining figures in math mode. The option {\tt osf} switches to old-style figures in text at the very end of the preamble, forcing the use of oldstyle figures in text, but not math. In previous versions, it was necessary to run -\verb|\useosf| after loading math. This is no longer required, but does no harm. As of version 1.4, there are four normal figure styles: tabular lining, tabular oldstyle, proportional lining and proportional oldstyle, the default figure alignment being \texttt{tabular}. To switch to \texttt{proportional}, use the option \texttt{p} or \texttt{proportional}. +\verb|\useosf| after loading math. This is no longer required, but does no harm. + +There is one special case where \verb|\useosf| is necessary: in you use the {\tt babel} package, you may receive puzzling error messages if you used a preamble containing +\begin{verbatim} +\usepackage[osf]{newtxtext} +\usepackage[<babel options>]{babel} +\usepackage{newtxmath} +\end{verbatim} +There error, when it occurs, seems to be caused by an incompatibility between some {\tt babel} code and the {\tt etoolbox} command \verb|\AtEndPreamble|. In this case, use instead the more cumbersome form +\begin{verbatim} +\usepackage{newtxtext} +\usepackage[<babel options>]{babel} +\usepackage{newtxmath} +\useosf % must be after loading math package +\end{verbatim} +As of version 1.4, there are four normal figure styles: tabular lining, tabular oldstyle, proportional lining and proportional oldstyle, the default figure alignment being \texttt{tabular}. To switch to \texttt{proportional}, use the option \texttt{p} or \texttt{proportional}. Option {\tt defaultsups} (same effect as {\tt defaultsups=true}) forces the package to use the \LaTeX\ default footnote markers (or, at least, those in force when the package is loaded) instead of those preferred by the package---Times Roman superior figures instead of spindly ordinary Times lining figures reduced to about 70\%. (Footnote markers in minipages use the default lowercase italic alphabetic characters, unless otherwise specified by redefining \verb|\thempfootnote|.) For better control over position and size of footnote markers, use the {\tt superiors} package after loading {\tt newtxtext}. The \verb|\sustyle| font switch and its related \verb|\textsu| macro know not only about figures, but also the lower case letters, including \texttt{egrave}, so that traditional French expressions like \textlf{1}\textsu{i\`ere} may be typeset correctly. Option \texttt{largesc} changes the small cap glyphs from the default petite caps defined in TeXGyre Termes (same size as in txfonts) to a larger size that, in upright shapes, is metrically compatible with Adobe's small caps. These are about 10\% larger than petite caps. For a comparison, \textsc{Small Caps}, {\usefont{T1}{qtm}{m}{sc}Petite Caps}, and \textsc{\textit{Italic Small Caps}}, {\usefont{T1}{qtm}{m}{scit}Italic Petite Caps}. -Option \texttt{adobesc} is only for those who own licenses for \textsf{Adobe Small Caps} and install them into the \texttt{ptmsc} package downloaded from \textsc{ctan}. This option loads \texttt{largesc} and substitutes the Adobe glyphs, where available, including their larger Regular and Bold tabular oldstyle figures. +Option \texttt{adobesc} is only for those who own licenses for \textsf{Adobe Times Small Caps} and install them into the \texttt{ptmsc} package downloaded from \textsc{ctan}. This option loads \texttt{largesc} and substitutes the Adobe glyphs, where available, including their larger Regular and Bold tabular oldstyle figures. + +The {\tt theoremfont} option changes the default font used for the {\tt plain} theoremstyle of {\tt amsthm}, keeping italic text but substituting upright figures and punctuation, and, provided you have loaded {\tt theorem} or {\tt amsthm} before {\tt newtxtext}, it will redefine the plain theoremstyle. For example, with this option, you get theorem statements like this: + +\begin{thm} +This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$]. +\end{thm} +Compare this to traditional {\tt plain} theoremstyle with the same text: +\begin{oldthm} +This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$]. +\end{oldthm} \section{Math mode options} The package invoked by \begin{verbatim} @@ -103,6 +142,7 @@ 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 Option {\tt frenchmath} sets the default style in math mode for rendering uppercase Roman and Greek letters to upright, and lowercase Greek letters to upright. (Introduced in v.\ 1.28.) \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}.) diff --git a/Master/texmf-dist/fonts/afm/public/newtx/ntxtmri.afm b/Master/texmf-dist/fonts/afm/public/newtx/ntxtmri.afm index f9051e543d3..87a1f4848f1 100644 --- a/Master/texmf-dist/fonts/afm/public/newtx/ntxtmri.afm +++ b/Master/texmf-dist/fonts/afm/public/newtx/ntxtmri.afm @@ -1,6 +1,6 @@ StartFontMetrics 2.0 Comment Generated by FontForge 20150126 -Comment Creation Date: Sat Jan 31 16:23:17 2015 +Comment Creation Date: Thu Feb 12 09:56:55 2015 FontName ntxtmri FullName ntxtmri FamilyName ntxtm @@ -8,7 +8,7 @@ Weight Regular Notice (Copyright 2006, 2009 for TeX Gyre extensions by B. Jackowski and J.M. Nowacki (on behalf of TeX users groups). This work is released under the GUST Font License -- see http://tug.org/fonts/licenses/G) Comment UST-FONT-LICENSE.txt for details. Comment -Comment Copyright 2015 Michael Sharpe, released under the equivalent LPPL license. (Modified all small cap glyphs to larger size.) +Comment Copyright 2015 Michael Sharpe, released under the equivalent LPPL license. (Modified all small cap glyphs to larger size. Added "theorem font" glyphs.) ItalicAngle -15 IsFixedPitch false UnderlinePosition -34 @@ -20,7 +20,7 @@ CapHeight 653 XHeight 432 Ascender 653 Descender -205 -StartCharMetrics 1090 +StartCharMetrics 1122 C 32 ; WX 250 ; N space ; B 0 0 0 0 ; C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ; C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ; @@ -1111,6 +1111,38 @@ C -1 ; WX 511 ; N ndotaccent.sc ; B 2 -12 543 669 ; C -1 ; WX 511 ; N ndotbelow.sc ; B 2 -211 543 485 ; C -1 ; WX 471 ; N rdotbelow.sc ; B 7 -211 444 485 ; C -1 ; WX 471 ; N rdotbelowmacron.sc ; B 7 -211 495 643 ; +C -1 ; WX 500 ; N zero.up ; B 24 -14 476 676 ; +C -1 ; WX 500 ; N one.up ; B 111 0 394 676 ; +C -1 ; WX 500 ; N two.up ; B 30 0 475 676 ; +C -1 ; WX 500 ; N three.up ; B 43 -14 432 676 ; +C -1 ; WX 500 ; N four.up ; B 12 0 472 676 ; +C -1 ; WX 500 ; N five.up ; B 32 -14 438 688 ; +C -1 ; WX 500 ; N six.up ; B 34 -14 468 684 ; +C -1 ; WX 500 ; N seven.up ; B 20 -8 449 662 ; +C -1 ; WX 500 ; N eight.up ; B 56 -14 445 676 ; +C -1 ; WX 500 ; N nine.up ; B 30 -22 459 676 ; +C -1 ; WX 373 ; N exclam.up ; B 160 -9 267 676 ; +C -1 ; WX 399 ; N parenleft.up ; B 94 -177 350 676 ; +C -1 ; WX 438 ; N parenright.up ; B 99 -177 355 676 ; +C -1 ; WX 489 ; N question.up ; B 98 -8 444 676 ; +C -1 ; WX 398 ; N bracketleft.up ; B 154 -156 365 662 ; +C -1 ; WX 423 ; N bracketright.up ; B 114 -156 325 662 ; +C -1 ; WX 402 ; N braceleft.up ; B 70 -181 330 680 ; +C -1 ; WX 400 ; N braceright.up ; B 70 -181 332 680 ; +C -1 ; WX 333 ; N exclamdown.up ; B 96 -226 203 459 ; +C -1 ; WX 444 ; N questiondown.up ; B 30 -226 376 458 ; +C -1 ; WX 278 ; N colon.up ; B 97 -11 208 459 ; +C -1 ; WX 298 ; N semicolon.up ; B 100 -141 239 459 ; +C -1 ; WX 530 ; N zero.osfup ; B 40 -20 490 479 ; +C -1 ; WX 438 ; N one.osfup ; B 40 -3 398 485 ; +C -1 ; WX 527 ; N two.osfup ; B 40 -3 487 478 ; +C -1 ; WX 519 ; N three.osfup ; B 40 -238 479 477 ; +C -1 ; WX 550 ; N four.osfup ; B 40 -225 510 513 ; +C -1 ; WX 496 ; N five.osfup ; B 40 -238 456 471 ; +C -1 ; WX 516 ; N six.osfup ; B 40 -20 476 689 ; +C -1 ; WX 533 ; N seven.osfup ; B 40 -238 493 454 ; +C -1 ; WX 514 ; N eight.osfup ; B 40 -20 474 689 ; +C -1 ; WX 517 ; N nine.osfup ; B 40 -230 477 479 ; EndCharMetrics StartKernData StartKernPairs 11328 diff --git a/Master/texmf-dist/fonts/enc/dvips/newtx/libertinealt.enc b/Master/texmf-dist/fonts/enc/dvips/newtx/libertinealt.enc index 9a64263fe3d..a0d0f1cb04a 100644 --- a/Master/texmf-dist/fonts/enc/dvips/newtx/libertinealt.enc +++ b/Master/texmf-dist/fonts/enc/dvips/newtx/libertinealt.enc @@ -15,7 +15,7 @@ % 0x20 /psi /omega /epsilon /theta1 /omega1 /uni03F1 /sigma1 /phi - /.notdef /.notdef /.notdef /.notdef + /uni03F0 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef % 0x30 /.notdef /.notdef /.notdef /.notdef diff --git a/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc b/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc index ebe4d63dccd..1e03dec2631 100644 --- a/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc +++ b/Master/texmf-dist/fonts/enc/dvips/newtx/ntxmiaalt.enc @@ -21,7 +21,7 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /universal /existential /nexists /emptyset - /.notdef /.notdef /.notdef /.notdef + /kappa1 /kapp1up /.notdef /.notdef % 0x40 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef diff --git a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map index 804919c45a5..2764befd359 100644 --- a/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map +++ b/Master/texmf-dist/fonts/map/dvips/newtx/newtx.map @@ -69,8 +69,8 @@ rtxbmi7-rev rtxbmi7-rev <rtxbmi7-rev.pfb rtxbmi5-rev rtxbmi5-rev <rtxbmi5-rev.pfb txex-bar txex-bar <txex-bar.pfb txbex-bar txbex-bar <txbex-bar.pfb -ntxsyralt ntxsyralt " ntxmiaaltEncoding ReEncodeFont " <[ntxmiaalt.enc <ntxsyralt.pfb -ntxsybalt ntxsybalt " ntxmiaaltEncoding ReEncodeFont " <[ntxmiaalt.enc <ntxsybalt.pfb +ntxsyralt ntxsyralt <ntxsyralt.pfb +ntxsybalt ntxsybalt <ntxsybalt.pfb MinLibIta-ly1 MinLibIta " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibIta MinLibBolIta-ly1 MinLibBolIta " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibBolIta MinLibReg-ly1 MinLibReg " TeXnANSIEncoding ReEncodeFont " <[texnansx.enc <MinLibReg @@ -243,3 +243,9 @@ ntx-Regular-tlf-scl-t1 ntxtmr " encntx-ec-tlf-sc ReEncodeFont " <[ntx-ec-tlf-sc. ntx-Regular-tosf-scl-ly1 ntxtmr " encntx-texnansi-tosf-sc ReEncodeFont " <[ntx-texnansi-tosf-sc.enc <ntxtmr.pfb ntx-Regular-tosf-scl-ot1 ntxtmr " encntx-ot1-tosf-sc ReEncodeFont " <[ntx-ot1-tosf-sc.enc <ntxtmr.pfb ntx-Regular-tosf-scl-t1 ntxtmr " encntx-ec-tosf-sc ReEncodeFont " <[ntx-ec-tosf-sc.enc <ntxtmr.pfb +ntx-Italic-tlf-th-t1 ntxtmri " encntx-ecth-tlf ReEncodeFont " <[ntx-ecth-tlf.enc <ntxtmri.pfb +ntx-Italic-osf-th-t1 ntxtmri " encntx-ecth-osf ReEncodeFont " <[ntx-ecth-osf.enc <ntxtmri.pfb +ntx-Italic-tlf-th-ot1 ntxtmri " encntx-ot1-th-tlf ReEncodeFont " <[ntx-ot1-th-tlf.enc <ntxtmri.pfb +ntx-Italic-osf-th-ot1 ntxtmri " encntx-ot1-th-osf ReEncodeFont " <[ntx-ot1-th-osf.enc <ntxtmri.pfb +ntx-Italic-tlf-th-ly1 ntxtmri " encntx-texnansi-th-tlf ReEncodeFont " <[ntx-texnansi-th-tlf.enc <ntxtmri.pfb +ntx-Italic-osf-th-ly1 ntxtmri " encntx-texnansi-th-osf ReEncodeFont " <[ntx-texnansi-th-osf.enc <ntxtmri.pfb diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-ly1.tfm Binary files differnew file mode 100644 index 00000000000..572b56b6aea --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-ot1.tfm Binary files differnew file mode 100644 index 00000000000..02ae7071d67 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-t1.tfm Binary files differnew file mode 100644 index 00000000000..0391ad48982 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-osf-th-t1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-ly1.tfm Binary files differnew file mode 100644 index 00000000000..b05fd943af4 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-ly1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-ot1.tfm Binary files differnew file mode 100644 index 00000000000..1d7347289c9 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-ot1.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-t1.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-t1.tfm Binary files differnew file mode 100644 index 00000000000..a9d51580d7a --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newtx/ntx-Italic-tlf-th-t1.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 74306ebdd37..f3befeccedc 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 fd0f746e5ce..cb2d95e9d1b 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 649b7d93f33..a1e0646f012 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 5d3c20deb61..8908f0306cc 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 9822e07e6e4..98d4fcae8c7 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 e7be10beadd..6c435034065 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/rfxlr-alt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlr-alt.tfm Binary files differindex 8955845ec4d..be98db11d5a 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlr-alt.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlr-alt.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlri-alt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlri-alt.tfm Binary files differindex 225c2696ace..be441ac29ab 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlri-alt.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlri-alt.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlz-alt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlz-alt.tfm Binary files differindex 19eadab8161..16c1b51cf77 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlz-alt.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlz-alt.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlzi-alt.tfm b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlzi-alt.tfm Binary files differindex 42febe04572..280cd8c5f60 100644 --- a/Master/texmf-dist/fonts/tfm/public/newtx/rfxlzi-alt.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newtx/rfxlzi-alt.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 d4d156b49eb..2f4f58fe425 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 59279edaf46..e6e1eb1b91a 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/ntxtmri.pfb b/Master/texmf-dist/fonts/type1/public/newtx/ntxtmri.pfb Binary files differindex ad52c11edc4..0137c6dcf7a 100644 --- a/Master/texmf-dist/fonts/type1/public/newtx/ntxtmri.pfb +++ b/Master/texmf-dist/fonts/type1/public/newtx/ntxtmri.pfb 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 70560662453..495cc61b211 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 01ccdb29e04..833a9505d04 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 aab2cf1c126..c9dd25509cb 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 ffcbac6afd6..dcd75d81cd2 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/ly1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd index 0bfccc498b4..1b8c4893cf5 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{LY1}{ntxlf}{} \DeclareFontShape{LY1}{ntxlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-lf-sc\ntx@lsfx-ly1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{LY1}{ntxlf}{bx}{n}{<->ssub * ntxlf/b/n}{} \DeclareFontShape{LY1}{ntxlf}{bx}{scit}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{LY1}{ntxlf}{bx}{it}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{LY1}{ntxlf}{b}{sl}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{LY1}{ntxlf}{m}{sl}{<->ssub * ntxlf/m/it}{} +\DeclareFontShape{LY1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ly1}{} +\DeclareFontShape{LY1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} +\DeclareFontShape{LY1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} \DeclareFontShape{LY1}{ntxlf}{b}{scsl}{<->ssub * ntxlf/b/scit}{} +\DeclareFontShape{LY1}{ntxlf}{bx}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{LY1}{ntxlf}{m}{scsl}{<->ssub * ntxlf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd index 3000a10d15a..a8cfb9e85cb 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{LY1}{ntxosf}{} \DeclareFontShape{LY1}{ntxosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-osf-sc\ntx@lsfx-ly1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{LY1}{ntxosf}{bx}{n}{<->ssub * ntxosf/b/n}{} \DeclareFontShape{LY1}{ntxosf}{bx}{scit}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{LY1}{ntxosf}{bx}{it}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{LY1}{ntxosf}{b}{sl}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{LY1}{ntxosf}{m}{sl}{<->ssub * ntxosf/m/it}{} +\DeclareFontShape{LY1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ly1}{} +\DeclareFontShape{LY1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} +\DeclareFontShape{LY1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} \DeclareFontShape{LY1}{ntxosf}{b}{scsl}{<->ssub * ntxosf/b/scit}{} +\DeclareFontShape{LY1}{ntxosf}{bx}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{LY1}{ntxosf}{m}{scsl}{<->ssub * ntxosf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxss.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxss.fd deleted file mode 100644 index 1c8f05dc824..00000000000 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxss.fd +++ /dev/null @@ -1,53 +0,0 @@ -\ProvidesFile{ly1ntxss.fd} - [2000/12/15 v3.1] -\expandafter\ifx\csname ntx@helvscaled\endcsname\relax - \let\ntx@helvscaled\@empty% -\fi - -\DeclareFontFamily{LY1}{ntxss}{} -\DeclareFontShape{LY1}{ntxss}{m}{n}{ %medium - <->\ntx@helvscaled tyxss% -}{} -\DeclareFontShape{LY1}{ntxss}{m}{sc}{ %cap & small cap - <->\ntx@helvscaled tyxsssc% -}{} -\DeclareFontShape{LY1}{ntxss}{m}{sl}{ %slanted - <->\ntx@helvscaled tyxsssl% -}{} -\DeclareFontShape{LY1}{ntxss}{m}{it}{ %italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{LY1}{ntxss}{m}{ui}{ %unslanted italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{LY1}{ntxss}{bx}{n}{ %bold extended - <->\ntx@helvscaled tyxbss% -}{} -\DeclareFontShape{LY1}{ntxss}{bx}{sc}{ %bold extended cap & small cap - <->\ntx@helvscaled tyxbsssc% -}{} -\DeclareFontShape{LY1}{ntxss}{bx}{sl}{ %bold extended slanted - <->\ntx@helvscaled tyxbsssl% -}{} -\DeclareFontShape{LY1}{ntxss}{bx}{it}{ %bold extended italic - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{LY1}{ntxss}{bx}{ui}{ %bold extended unslanted italic - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{LY1}{ntxss}{b}{n}{ %bold - <->ssub * txss/bx/n% -}{} -\DeclareFontShape{LY1}{ntxss}{b}{sc}{ %bold cap & small cap - <->ssub * txss/bx/sc% -}{} -\DeclareFontShape{LY1}{ntxss}{b}{sl}{ %bold slanted - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{LY1}{ntxss}{b}{it}{ %bold italic - <->ssub * txss/bx/it% -}{} -\DeclareFontShape{LY1}{ntxss}{b}{ui}{ %bold unslanted italic - <->ssub * txss/bx/ui% -}{} -\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd index 0fd425fda95..e4de72608f5 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{LY1}{ntxtlf}{} \DeclareFontShape{LY1}{ntxtlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tlf-sc\ntx@lsfx-ly1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{LY1}{ntxtlf}{bx}{n}{<->ssub * ntxtlf/b/n}{} \DeclareFontShape{LY1}{ntxtlf}{bx}{scit}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{LY1}{ntxtlf}{bx}{it}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{LY1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{LY1}{ntxtlf}{m}{sl}{<->ssub * ntxtlf/m/it}{} +\DeclareFontShape{LY1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ly1}{} +\DeclareFontShape{LY1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} +\DeclareFontShape{LY1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} \DeclareFontShape{LY1}{ntxtlf}{b}{scsl}{<->ssub * ntxtlf/b/scit}{} +\DeclareFontShape{LY1}{ntxtlf}{bx}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{LY1}{ntxtlf}{m}{scsl}{<->ssub * ntxtlf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd index b1da4e4563a..195ab7a9e95 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd @@ -5,12 +5,9 @@ \fi \def\ntx@asfx{} \def\ntx@lsfx{} -\ifdefined\ntx@adobescfalse % - \ifntx@adobesc \def\ntx@asfx{a}\def\ntx@lsfx{l} - \else - \ifntx@largesc\def\ntx@lsfx{l}\fi - \fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\def\ntx@makeadobesc{\ifntx@adobesc\def\ntx@lsfx{l}\def\ntx@adobesc{a}\else\ntx@makelsfx\fi} +\ifdefined\ntx@adobescfalse\ntx@makeadobesc\fi \DeclareFontFamily{LY1}{ntxtosf}{} \DeclareFontShape{LY1}{ntxtosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tosf-sc\ntx@lsfx\ntx@asfx-ly1}{} @@ -25,8 +22,10 @@ \DeclareFontShape{LY1}{ntxtosf}{bx}{n}{<->ssub * ntxtosf/b/n}{} \DeclareFontShape{LY1}{ntxtosf}{bx}{scit}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{LY1}{ntxtosf}{bx}{it}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{LY1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{LY1}{ntxtosf}{m}{sl}{<->ssub * ntxtosf/m/it}{} +\DeclareFontShape{LY1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ly1}{} +\DeclareFontShape{LY1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} +\DeclareFontShape{LY1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} \DeclareFontShape{LY1}{ntxtosf}{b}{scsl}{<->ssub * ntxtosf/b/scit}{} +\DeclareFontShape{LY1}{ntxtosf}{bx}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{LY1}{ntxtosf}{m}{scsl}{<->ssub * ntxtosf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 4842255a1f4..4bc4a314531 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.4} -\def\filedate{2015/01/31} +\def\fileversion{1.41} +\def\filedate{2015/02/13} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -80,7 +80,7 @@ \DeclareOption{frenchmath}{\tx@frenchmtrue} \ExecuteOptions{% amssymbols,uprightGreek} -\ProcessOptions* +\ProcessOptions* % frenchmath implies uprightGreek \iftx@frenchm\tx@slantedGfalse\fi @@ -891,7 +891,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\curvearrowleft}{\mathrel}{AMSb}{120} \re@DeclareMathSymbol{\curvearrowright}{\mathrel}{AMSb}{121} \re@DeclareMathSymbol{\digamma}{\mathord}{AMSb}{122} -\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123} +%\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123} \re@DeclareMathSymbol{\Bbbk}{\mathord}{AMSb}{124} \re@DeclareMathSymbol{\hslash}{\mathord}{AMSb}{125} \re@DeclareMathSymbol{\hbar}{\mathord}{AMSb}{126} @@ -1165,7 +1165,13 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Italic A (ntxmia) Definition % lettersA %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +\iftx@minion + \re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123} + \re@DeclareMathSymbol{\varkappaup}{\mathord}{AMSb}{123} +\else + \DeclareMathSymbol{\varkappa}{\mathord}{lettersA}{41} + \DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{42} +\fi % upright Greek \re@DeclareMathSymbol{\Gammaup}{\mathord}{lettersA}{0} \re@DeclareMathSymbol{\Deltaup}{\mathord}{lettersA}{1} @@ -1251,6 +1257,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \let\upvarrho\varrhoup \let\upvarsigma\varsigmaup \let\upvarphi\varphiup +\let\upvarkappa\varkappaup % the mathgroup of lettersA is stored in macro \symlettersA \iftx@frenchm \let\alpha\alphaup @@ -1282,6 +1289,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \let\varrho\varrhoup \let\varsigma\varsigmaup \let\varphi\varphiup + \let\varkappa\varkappaup \DeclareMathSymbol{A}{\mathalpha}{operators}{65} \DeclareMathSymbol{B}{\mathalpha}{operators}{66} \DeclareMathSymbol{C}{\mathalpha}{operators}{67} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index b8dc42eb5d8..7fd5ce97d61 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.4} -\def\filedate{2015/01/31} +\def\fileversion{1.41} +\def\filedate{2015/02/12} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} @@ -30,6 +30,10 @@ \csname ntx@prop#1\endcsname} \define@boolkey{ntx}{adobesc}[true]{% \csname ntx@adobesc#1\endcsname} +\newif\ifntx@babel +\define@key{ntx}{babel}[true]{% +\csname ntx@babel#1\endcsname} +\newif\ifntx@thrm \define@key{ntx}{helvratio}[0.9]{\def\ntx@helvratio{#1}} \define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}% \def\ntx@scale{#1}} @@ -37,6 +41,7 @@ \setkeys{ntx}{scaled} % get at least default \DeclareOption{lining}{\edef\ntx@figurestyle{lf}} \DeclareOption{lf}{\edef\ntx@figurestyle{lf}} +\DeclareOption{theoremfont}{\ntx@thrmtrue} \DeclareOption{oldstyle}{\useosf} \DeclareOption{osf}{\useosf} \DeclareOption{tabular}{\edef\ntx@figurealign{t}} @@ -53,18 +58,15 @@ \x} \ProcessOptions* -%Each tosf fd file should contain: -%\def\ntx@asfx{} -%\ifdefined\ntx@adobescfalse % -% \ifntx@adobesc \def\ntx@asfx{a}\def\ntx@lsfx{l} -%\else -%\ifntx@largesc\def\ntx@asfx{l}\fi -%\fi\fi \@tempdima=\ntx@scale\p@\@tempdima=\ntx@helvratio\@tempdima% \edef\qhv@scale{\strip@pt\@tempdima} \RequirePackage[T1]{fontenc} \RequirePackage[full]{textcomp} +\DeclareRobustCommand{\sustyle}{% + \not@math@alphabet\sustyle\relax + \fontfamily{ntxsups}\selectfont} + \ifntx@scosf % \DeclareRobustCommand{\textsc}[1]{% {\fontfamily{ntx\ntx@figurealign osf}\scshape\selectfont #1}% @@ -98,11 +100,23 @@ \DeclareRobustCommand{\texttosf}[1]{% {\tosfstyle #1}% }% to get tosf - -\DeclareRobustCommand{\sustyle}{% - \not@math@alphabet\sustyle\relax - \fontfamily{ntxsups}\selectfont} -\DeclareTextFontCommand{\textsu}{\sustyle} +\DeclareRobustCommand{\textsu}[1]{% + {\sustyle #1}% +}% to get sup style + +\ifntx@thrm + \ifdefined\newtheoremstyle + \newtheoremstyle{plain} + {\topsep} % ABOVESPACE + {\topsep} % BELOWSPACE + {\slshape} % BODYFONT--\slshape is defined to be \itshape with upright figures and punctuation + {} % INDENT (empty value is the same as 0pt) + {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection + {.} % HEADPUNCT + {5pt plus 1pt minus 1pt} % HEADSPACE + {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section] + \fi% +\fi%\DeclareTextFontCommand{\textsu}{\sustyle} %\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi} \ifntx@defaultsups % \else @@ -146,10 +160,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%\renewcommand{\sfdefault}{ntxss} \renewcommand*{\sfdefault}{qhv} -%\show\qhv@scale -%\show\ntx@helvratio %\DeclareMathAlphabet{\mathsf}{OT1}{txss}{m}{n} %\SetMathAlphabet{\mathsf}{bold}{OT1}{txss}{b}{n} @@ -204,9 +215,16 @@ \ifx\encodingdefault\LY@n@@nc@d@ng\LY@n@@nc@d@ngM@cr@M@d\fi% } -\AtEndPreamble{% +\ifntx@babel + \renewcommand*{\rmdefault}{ntx\ntx@figurealign% + \ntx@figurestyle} + \normalfont +\else + \AtEndPreamble{% \renewcommand*{\rmdefault}{ntx\ntx@figurealign% \ntx@figurestyle} \normalfont} +\fi + \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd index 4d8d5be79bb..93d7796f082 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{OT1}{ntxlf}{} \DeclareFontShape{OT1}{ntxlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-lf-sc\ntx@lsfx-ot1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{OT1}{ntxlf}{bx}{n}{<->ssub * ntxlf/b/n}{} \DeclareFontShape{OT1}{ntxlf}{bx}{scit}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{OT1}{ntxlf}{bx}{it}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{OT1}{ntxlf}{b}{sl}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{OT1}{ntxlf}{m}{sl}{<->ssub * ntxlf/m/it}{} +\DeclareFontShape{OT1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ot1}{} +\DeclareFontShape{OT1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} +\DeclareFontShape{OT1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} \DeclareFontShape{OT1}{ntxlf}{b}{scsl}{<->ssub * ntxlf/b/scit}{} +\DeclareFontShape{OT1}{ntxlf}{bx}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{OT1}{ntxlf}{m}{scsl}{<->ssub * ntxlf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd index fe708ce4a15..718b6507681 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{OT1}{ntxosf}{} \DeclareFontShape{OT1}{ntxosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-osf-sc\ntx@lsfx-ot1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{OT1}{ntxosf}{bx}{n}{<->ssub * ntxosf/b/n}{} \DeclareFontShape{OT1}{ntxosf}{bx}{scit}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{OT1}{ntxosf}{bx}{it}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{OT1}{ntxosf}{b}{sl}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{OT1}{ntxosf}{m}{sl}{<->ssub * ntxosf/m/it}{} +\DeclareFontShape{OT1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ot1}{} +\DeclareFontShape{OT1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} +\DeclareFontShape{OT1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} \DeclareFontShape{OT1}{ntxosf}{b}{scsl}{<->ssub * ntxosf/b/scit}{} +\DeclareFontShape{OT1}{ntxosf}{bx}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{OT1}{ntxosf}{m}{scsl}{<->ssub * ntxosf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxss.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxss.fd deleted file mode 100644 index b9220ed1946..00000000000 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxss.fd +++ /dev/null @@ -1,60 +0,0 @@ -\ProvidesFile{ot1ntxss.fd} - [2000/12/15 v3.1] -\expandafter\ifx\csname ntx@helvscaled\endcsname\relax - \let\ntx@helvscaled\@empty% -\fi - -\DeclareFontFamily{OT1}{ntxss}{\hyphenchar\font45 } -\DeclareFontShape{OT1}{ntxss}{m}{n}{ %rebular - <-> -\ntx@helvscaled txss% -}{} -\DeclareFontShape{OT1}{ntxss}{m}{sc}{ %cap & small cap - <-> -\ntx@helvscaled txsssc% -}{} -\DeclareFontShape{OT1}{ntxss}{m}{sl}{ %slanted - <-> -\ntx@helvscaled txsssl% -}{} -\DeclareFontShape{OT1}{ntxss}{m}{it}{ %italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{OT1}{ntxss}{m}{ui}{ %unslanted italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{OT1}{ntxss}{b}{n}{ %bold - <-> -\ntx@helvscaled txbss% -}{} -\DeclareFontShape{OT1}{ntxss}{b}{sc}{ %bold cap & small cap - <-> -\ntx@helvscaled txbsssc% -}{} -\DeclareFontShape{OT1}{ntxss}{b}{sl}{ %bold slanted - <-> -\ntx@helvscaled txbsssl% -}{} -\DeclareFontShape{OT1}{ntxss}{b}{it}{ %bold italic - <->ssub * txss/b/sl% -}{} -\DeclareFontShape{OT1}{ntxss}{b}{ui}{ %bold unslanted italic - <->ssub * txss/b/sl% -}{} -\DeclareFontShape{OT1}{ntxss}{bx}{n}{ %bold extended - <->ssub * txss/b/n% -}{} -\DeclareFontShape{OT1}{ntxss}{bx}{sc}{ %bold extended cap & small cap - <->ssub * txss/b/sc% -}{} -\DeclareFontShape{OT1}{ntxss}{bx}{sl}{ %bold extended slanted - <->ssub * txss/b/sl% -}{} -\DeclareFontShape{OT1}{ntxss}{bx}{it}{ %bold extended italic - <->ssub * txss/b/sl% -}{} -\DeclareFontShape{OT1}{ntxss}{bx}{ui}{ %bold extended unslanted italic - <->ssub * txss/b/sl% -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd index bdecd71fda5..5f4a25a9590 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{OT1}{ntxtlf}{} \DeclareFontShape{OT1}{ntxtlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tlf-sc\ntx@lsfx-ot1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{OT1}{ntxtlf}{bx}{n}{<->ssub * ntxtlf/b/n}{} \DeclareFontShape{OT1}{ntxtlf}{bx}{scit}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{OT1}{ntxtlf}{bx}{it}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{OT1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{OT1}{ntxtlf}{m}{sl}{<->ssub * ntxtlf/m/it}{} +\DeclareFontShape{OT1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-ot1}{} +\DeclareFontShape{OT1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} +\DeclareFontShape{OT1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} \DeclareFontShape{OT1}{ntxtlf}{b}{scsl}{<->ssub * ntxtlf/b/scit}{} +\DeclareFontShape{OT1}{ntxtlf}{bx}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{OT1}{ntxtlf}{m}{scsl}{<->ssub * ntxtlf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd index 51fdd3c4e39..5e897d0ced2 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd @@ -5,12 +5,9 @@ \fi \def\ntx@asfx{} \def\ntx@lsfx{} -\ifdefined\ntx@adobescfalse % - \ifntx@adobesc \def\ntx@asfx{a}\def\ntx@lsfx{l} - \else - \ifntx@largesc\def\ntx@lsfx{l}\fi - \fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\def\ntx@makeadobesc{\ifntx@adobesc\def\ntx@lsfx{l}\def\ntx@adobesc{a}\else\ntx@makelsfx\fi} +\ifdefined\ntx@adobescfalse\ntx@makeadobesc\fi \DeclareFontFamily{OT1}{ntxtosf}{} \DeclareFontShape{OT1}{ntxtosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tosf-sc\ntx@lsfx\ntx@asfx-ot1}{} @@ -25,8 +22,10 @@ \DeclareFontShape{OT1}{ntxtosf}{bx}{n}{<->ssub * ntxtosf/b/n}{} \DeclareFontShape{OT1}{ntxtosf}{bx}{scit}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{OT1}{ntxtosf}{bx}{it}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{OT1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{OT1}{ntxtosf}{m}{sl}{<->ssub * ntxtosf/m/it}{} +\DeclareFontShape{OT1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-ot1}{} +\DeclareFontShape{OT1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} +\DeclareFontShape{OT1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} \DeclareFontShape{OT1}{ntxtosf}{b}{scsl}{<->ssub * ntxtosf/b/scit}{} +\DeclareFontShape{OT1}{ntxtosf}{bx}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{OT1}{ntxtosf}{m}{scsl}{<->ssub * ntxtosf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd index a428546e680..b3a3719719a 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{T1}{ntxlf}{} \DeclareFontShape{T1}{ntxlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-lf-sc\ntx@lsfx-t1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{T1}{ntxlf}{bx}{n}{<->ssub * ntxlf/b/n}{} \DeclareFontShape{T1}{ntxlf}{bx}{scit}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{T1}{ntxlf}{bx}{it}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{T1}{ntxlf}{b}{sl}{<->ssub * ntxlf/b/it}{} -\DeclareFontShape{T1}{ntxlf}{m}{sl}{<->ssub * ntxlf/m/it}{} +\DeclareFontShape{T1}{ntxlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-t1}{} +\DeclareFontShape{T1}{ntxlf}{b}{sl}{<->ssub * ntxlf/m/sl}{} +\DeclareFontShape{T1}{ntxlf}{bx}{sl}{<->ssub * ntxlf/m/sl}{} \DeclareFontShape{T1}{ntxlf}{b}{scsl}{<->ssub * ntxlf/b/scit}{} +\DeclareFontShape{T1}{ntxlf}{bx}{scsl}{<->ssub * ntxlf/b/scit}{} \DeclareFontShape{T1}{ntxlf}{m}{scsl}{<->ssub * ntxlf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd index 978efd0a8e7..d1033fee06f 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{T1}{ntxosf}{} \DeclareFontShape{T1}{ntxosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-osf-sc\ntx@lsfx-t1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{T1}{ntxosf}{bx}{n}{<->ssub * ntxosf/b/n}{} \DeclareFontShape{T1}{ntxosf}{bx}{scit}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{T1}{ntxosf}{bx}{it}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{T1}{ntxosf}{b}{sl}{<->ssub * ntxosf/b/it}{} -\DeclareFontShape{T1}{ntxosf}{m}{sl}{<->ssub * ntxosf/m/it}{} +\DeclareFontShape{T1}{ntxosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-t1}{} +\DeclareFontShape{T1}{ntxosf}{b}{sl}{<->ssub * ntxosf/m/sl}{} +\DeclareFontShape{T1}{ntxosf}{bx}{sl}{<->ssub * ntxosf/m/sl}{} \DeclareFontShape{T1}{ntxosf}{b}{scsl}{<->ssub * ntxosf/b/scit}{} +\DeclareFontShape{T1}{ntxosf}{bx}{scsl}{<->ssub * ntxosf/b/scit}{} \DeclareFontShape{T1}{ntxosf}{m}{scsl}{<->ssub * ntxosf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxss.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxss.fd deleted file mode 100644 index f00251ef336..00000000000 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxss.fd +++ /dev/null @@ -1,54 +0,0 @@ -\ProvidesFile{t1ntxss.fd} - [2000/12/15 v3.1] -\expandafter\ifx\csname ntx@helvscaled\endcsname\relax - \let\ntx@helvscaled\@empty% -\fi - -\DeclareFontFamily{T1}{ntxss}{} -\DeclareFontShape{T1}{ntxss}{m}{n}{ %medium - <->\ntx@helvscaled t1xss% -}{} -\DeclareFontShape{T1}{ntxss}{m}{sc}{ %cap & small cap - <->\ntx@helvscaled t1xsssc% -}{} -\DeclareFontShape{T1}{ntxss}{m}{sl}{ %slanted - <->\ntx@helvscaled t1xsssl% -}{} -\DeclareFontShape{T1}{ntxss}{m}{it}{ %italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{T1}{ntxss}{m}{ui}{ %unslanted italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{T1}{ntxss}{bx}{n}{ %bold extended - <->\ntx@helvscaled t1xbss% -}{} -\DeclareFontShape{T1}{ntxss}{bx}{sc}{ %bold extended cap & small cap - <->\ntx@helvscaled t1xbsssc% -}{} -\DeclareFontShape{T1}{ntxss}{bx}{sl}{ %bold extended slanted - <->\ntx@helvscaled t1xbsssl% -}{} -\DeclareFontShape{T1}{ntxss}{bx}{it}{ %bold extended italic - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{T1}{ntxss}{bx}{ui}{ %bold extended unslanted italic - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{T1}{ntxss}{b}{n}{ %bold - <->ssub * txss/bx/n% -}{} -\DeclareFontShape{T1}{ntxss}{b}{sc}{ %bold cap & small cap - <->ssub * txss/bx/sc% -}{} -\DeclareFontShape{T1}{ntxss}{b}{sl}{ %bold slanted - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{T1}{ntxss}{b}{it}{ %bold italic - <->ssub * txss/bx/it% -}{} -\DeclareFontShape{T1}{ntxss}{b}{ui}{ %bold unslanted italic - <->ssub * txss/bx/ui% -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd index fa42132817e..034ef27a64e 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd @@ -4,9 +4,8 @@ \let\ntx@scaled\@empty% \fi \def\ntx@lsfx{} -\ifdefined\ntx@largescfalse % - \ifntx@largesc\def\ntx@lsfx{l}\fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\ifdefined\ntx@largescfalse \ntx@makelsfx\fi \DeclareFontFamily{T1}{ntxtlf}{} \DeclareFontShape{T1}{ntxtlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tlf-sc\ntx@lsfx-t1}{} @@ -21,8 +20,10 @@ \DeclareFontShape{T1}{ntxtlf}{bx}{n}{<->ssub * ntxtlf/b/n}{} \DeclareFontShape{T1}{ntxtlf}{bx}{scit}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{T1}{ntxtlf}{bx}{it}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{T1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/b/it}{} -\DeclareFontShape{T1}{ntxtlf}{m}{sl}{<->ssub * ntxtlf/m/it}{} +\DeclareFontShape{T1}{ntxtlf}{m}{sl}{<-> \ntx@scaled ntx-Italic-tlf-th-t1}{} +\DeclareFontShape{T1}{ntxtlf}{b}{sl}{<->ssub * ntxtlf/m/sl}{} +\DeclareFontShape{T1}{ntxtlf}{bx}{sl}{<->ssub * ntxtlf/m/sl}{} \DeclareFontShape{T1}{ntxtlf}{b}{scsl}{<->ssub * ntxtlf/b/scit}{} +\DeclareFontShape{T1}{ntxtlf}{bx}{scsl}{<->ssub * ntxtlf/b/scit}{} \DeclareFontShape{T1}{ntxtlf}{m}{scsl}{<->ssub * ntxtlf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd index a5f10dc42ed..0b6eba7489e 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd @@ -5,12 +5,9 @@ \fi \def\ntx@asfx{} \def\ntx@lsfx{} -\ifdefined\ntx@adobescfalse % - \ifntx@adobesc \def\ntx@asfx{a}\def\ntx@lsfx{l} - \else - \ifntx@largesc\def\ntx@lsfx{l}\fi - \fi -\fi +\def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} +\def\ntx@makeadobesc{\ifntx@adobesc\def\ntx@lsfx{l}\def\ntx@adobesc{a}\else\ntx@makelsfx\fi} +\ifdefined\ntx@adobescfalse\ntx@makeadobesc\fi \DeclareFontFamily{T1}{ntxtosf}{} \DeclareFontShape{T1}{ntxtosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tosf-sc\ntx@lsfx\ntx@asfx-t1}{} @@ -25,8 +22,10 @@ \DeclareFontShape{T1}{ntxtosf}{bx}{n}{<->ssub * ntxtosf/b/n}{} \DeclareFontShape{T1}{ntxtosf}{bx}{scit}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{T1}{ntxtosf}{bx}{it}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{T1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/b/it}{} -\DeclareFontShape{T1}{ntxtosf}{m}{sl}{<->ssub * ntxtosf/m/it}{} +\DeclareFontShape{T1}{ntxtosf}{m}{sl}{<-> \ntx@scaled ntx-Italic-osf-th-t1}{} +\DeclareFontShape{T1}{ntxtosf}{b}{sl}{<->ssub * ntxtosf/m/sl}{} +\DeclareFontShape{T1}{ntxtosf}{bx}{sl}{<->ssub * ntxtosf/m/sl}{} \DeclareFontShape{T1}{ntxtosf}{b}{scsl}{<->ssub * ntxtosf/b/scit}{} +\DeclareFontShape{T1}{ntxtosf}{bx}{scsl}{<->ssub * ntxtosf/b/scit}{} \DeclareFontShape{T1}{ntxtosf}{m}{scsl}{<->ssub * ntxtosf/m/scit}{} \endinput diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxss.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxss.fd deleted file mode 100644 index 70b02f48151..00000000000 --- a/Master/texmf-dist/tex/latex/newtx/ts1ntxss.fd +++ /dev/null @@ -1,53 +0,0 @@ -\ProvidesFile{ts1ntxss.fd} - [2000/12/15 v3.1] -\expandafter\ifx\csname ntx@helvscaled\endcsname\relax - \let\ntx@helvscaled\@empty% -\fi - -\DeclareFontFamily{TS1}{ntxss}{} -\DeclareFontShape{TS1}{ntxss}{m}{n}{ %medium - <->\ntx@helvscaled tcxss% -}{} -\DeclareFontShape{TS1}{ntxss}{m}{sc}{ %cap & small cap - <->ssub * txss/m/n% -}{} -\DeclareFontShape{TS1}{ntxss}{m}{sl}{ %slanted - <->\ntx@helvscaled tcxsssl% -}{} -\DeclareFontShape{TS1}{ntxss}{m}{it}{ %italic - <->ssub * txss/m/sl% -}{} -\DeclareFontShape{TS1}{ntxss}{m}{ui}{ %unslanted italic - <->ssub * txss/m/it% -}{} -\DeclareFontShape{TS1}{ntxss}{bx}{n}{ %bold extended - <->\ntx@helvscaled tcxbss% -}{} -\DeclareFontShape{TS1}{ntxss}{bx}{sc}{ %bold extended cap & small cap - <->ssub * txss/bx/n% -}{} -\DeclareFontShape{TS1}{ntxss}{bx}{sl}{ %bold extended slanted - <->\ntx@helvscaled tcxbsssl% -}{} -\DeclareFontShape{TS1}{ntxss}{bx}{it}{ %bold extended italic - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{TS1}{ntxss}{bx}{ui}{ %bold extended unslanted italic - <->ssub * txss/bx/it% -}{} -\DeclareFontShape{TS1}{ntxss}{b}{n}{ %bold - <->ssub * txss/bx/n% -}{} -\DeclareFontShape{TS1}{ntxss}{b}{sc}{ %bold cap & small cap - <->ssub * txss/bx/sc% -}{} -\DeclareFontShape{TS1}{ntxss}{b}{sl}{ %bold slanted - <->ssub * txss/bx/sl% -}{} -\DeclareFontShape{TS1}{ntxss}{b}{it}{ %bold italic - <->ssub * txss/bx/it% -}{} -\DeclareFontShape{TS1}{ntxss}{b}{ui}{ %bold unslanted italic - <->ssub * txss/bx/ui% -}{} -\endinput |