diff options
| author | Karl Berry <karl@freefriends.org> | 2016-08-16 21:42:23 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2016-08-16 21:42:23 +0000 |
| commit | b9e5fb751f5fb86c0d56372ae874583cfc58ef77 (patch) | |
| tree | f133d3e4ae8bb755f036b38747953ac66ee785b8 | |
| parent | 7a87323b2dd5e203aa1409c4584df5de58e80871 (diff) | |
newpx (16aug16)
git-svn-id: svn://tug.org/texlive/trunk@41863 c570f23f-e606-0410-a88d-b1316a301751
25 files changed, 513 insertions, 177 deletions
diff --git a/Master/texmf-dist/doc/fonts/newpx/README b/Master/texmf-dist/doc/fonts/newpx/README index 9625010ebd0..9b9e0dff97e 100644 --- a/Master/texmf-dist/doc/fonts/newpx/README +++ b/Master/texmf-dist/doc/fonts/newpx/README @@ -1,10 +1,13 @@ This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt -Current version: 1.295 2016-02-11 +Current version: 1.30 2016-08-12 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.3 +Changes to math fonts to bring newpxmath into parity with changes in newtxmath 1.5. + Changes in version 1.295 1. Generated with latest update to afm2tfm. 2. Documentation addition re using newpxmath in XeLaTeX and LuaLaTeX. diff --git a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf Binary files differindex 83d0f2be75d..35d3c5aa397 100644 --- a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf +++ b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.pdf diff --git a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex index 1401d609365..731cb1865e5 100644 --- a/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex +++ b/Master/texmf-dist/doc/fonts/newpx/newpxdoc.tex @@ -22,6 +22,8 @@ % newpx text and math \linespread{1.05} \usepackage[largesc,theoremfont]{newpxtext} +\usepackage[scaled=1.05]{nimbusmononarrow} +%\usepackage[scaled=1.05,zerostyle=a]{newtxtt} \usepackage{textcomp} \usepackage{newpxmath} \usepackage{bm} @@ -29,6 +31,9 @@ %SetFonts \usepackage{upquote} \font\pcf=zpl-Regular-osf-sc-t1 at 10.95pt +\makeatletter +\DeclareMathSymbol{\Sumop}{\mathop}{largesymbols}{"50} +\makeatother \usepackage{booktabs}\title{New PX font package} \author{Michael Sharpe} \date{\today} % Activate to display a given date or no date @@ -71,7 +76,7 @@ the new package is split into separate text and math packages that do not need t \item \verb|\coloneq| and \verb|\eqcolon| now point to the correct glyphs; \item The problem with the {\tt ogonek} accent and tabular environments (bad definition of \verb|\k|) is fixed; \item The default encoding for \textsf{newpxtext} 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 The font collection used for rendering text is based on TeXGyrePagella with a number of additions, denoted by TeXGyrePagellaX. The superior figures in this addition are set by default to render footnote markers. (It is also possible customize footnote markers by redefining \verb|\thefootnote| after loading {\tt newpxtext.sty}.) Small caps are available in all weights and styles, and are offered in two sizes. The default small caps supplied by TeXGyrePagella are really \textsc{Petite Caps}, having xheights approximately the same x-heights (sometimes smaller) than lowercase letters. Option \texttt{largesc} increases the size of small caps by about 8\%, approximating the size of Adobe Palatino Small Caps. IMO, this is a better match in terms of weight and size. For a side by side comparison: {\pcf Petite Caps}, \textsc{Small Caps}. +\item The font collection used for rendering text is based on TeXGyrePagella with a number of additions, denoted by TeXGyrePagellaX. The superior figures in this addition are set by default to render footnote markers. (It is also possible customize footnote markers by redefining \verb|\thefootnote| after loading {\tt newpxtext.sty}.) Small caps are available in all weights and styles, and are offered in two sizes. The default small caps supplied by TeXGyrePagella are really \textsc{Petite Caps}, having xheights approximately the same x-heights (sometimes smaller) as lowercase letters. Option \texttt{largesc} increases the size of small caps by about 8\%, approximating the size of Adobe Palatino Small Caps. IMO, this is a better match in terms of weight and size. For a side by side comparison: {\pcf Petite Caps}, \textsc{Small Caps}. \item Sans serif is by default taken from TeXGyreHeros, and by default at 94\% of the scale factor (set by {\tt scaled}, default value {\tt1}). The option {\tt helvratio=.98} will change that to 98\%. \item New math accents such as \verb|\widearc| have been introduced in tandem with the {\tt newtx} package, where they are documented. \end{itemize} @@ -136,7 +141,7 @@ If you want full control, the options {\tt spacing, stretch, shrink} allow you t \section{Usage with {\tt babel}} -You should normally load {\tt babel} before loading {\tt newpxtext} in order for {\tt babel} to function as expected. {\tt Newpxtext} will set an internal flag to indicate that {\tt babel} is being used. Option \texttt{babel} should be used only if you are forced to load {\tt babel} after {\tt newpxtext}. There appears to be an incompatibility between parts of {\tt babel} and \verb|\AtEndPreamble|. If you use {\tt babel}, and a math package, you have to omit the {\tt osf} option and use the macro \verb|\useosf| after loading the math package if you want oldstyle figures in text mode and lining figures in math mode. A similar macro \verb|\useproportional| makes proportional figures the deafault outside math mode. For example: +You should normally load {\tt babel} before loading {\tt newpxtext} in order for {\tt babel} to function as expected. {\tt Newpxtext} will set an internal flag to indicate that {\tt babel} is being used. Option \texttt{babel} should be used only if you are forced to load {\tt babel} after {\tt newpxtext}. There appears to be an incompatibility between parts of {\tt babel} and \verb|\AtEndPreamble|. If you use {\tt babel}, and a math package, you have to omit the {\tt osf} option and use the macro \verb|\useosf| after loading the math package if you want oldstyle figures in text mode and lining figures in math mode. A similar macro \verb|\useproportional| makes proportional figures the default outside math mode. For example: \begin{verbatim} \usepackage[greek.polutonico,english]{babel} \usepackage[theoremfont,largesc,tighter]{newpxtext} @@ -152,7 +157,7 @@ You should normally load {\tt babel} before loading {\tt newpxtext} in order for \end{verbatim} \section{Usage with Lua\LaTeX\ and Xe\LaTeX} -As far as I can tell, \textsf{newpxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. Be aware that some text packages (eg, {\tt cabin}) may contain a line like +As far as I can tell, \textsf{newpxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. Be aware that some text packages (e.g., {\tt cabin}) may contain a line like \begin{verbatim} \RequirePackage{fontspec} \end{verbatim} @@ -160,7 +165,7 @@ which would prevent (``option clash'' error) a subsequent \begin{verbatim} \usepackage[no-math]{fontspec} \end{verbatim} -unless suppressed by an appropriate option. Eg, +unless suppressed by an appropriate option. E.g., \begin{verbatim} \usepackage[type1]{cabin} \end{verbatim} @@ -175,7 +180,7 @@ While the math font options must be specified before {\tt fontspec}, be aware of \usepackage[scaled=.85]{beramono}% used only by \mathtt \usepackage[type1]{cabin}% used only by \mathsf \usepackage{amsthm}% load before newtxmath -\usepackage[cmintegrals,bigdelims,vvarbb]{newpxmath} +\usepackage[bigdelims,vvarbb]{newpxmath} \usepackage[scr=rsfso]{mathalfa} \usepackage{bm}% load after all math to give access to bold math %Now load the otf text fonts using fontspec---won't affect math @@ -191,10 +196,38 @@ The package invoked by \end{verbatim} loads the math part of the {\tt pxfonts} (with revised metrics and additional glyphs) and should be loaded \emph{after} the text font and its encoding have been specified, as it uses the text font settings to define how operators, numbers, math accents, \verb|\mathrm|, \verb|\mathbf| etc.\ are rendered. You should also load a Typewriter font so as not to generate mysterious error messages about \textsf{metafont} trying to generate \texttt{ectt10}. The package offers a number of options. \begin{itemize} +\item {\tt upint} (new as of version 1.3.) selects upright integrals---the default shape is slanted. Each shape/size of integral takes one of twelve form, illustrated below in the case of display size slanted integrals. +\[\int\quad\oint\quad\iint\quad\iiint\quad\iiiint\quad\oiint\quad\oiiint\quad\varointclockwise\quad\ointctrclockwise\quad\fint\quad\sumint\quad\sqint\] +named respectively +\begin{verbatim} +\int \oint \iint \iiint \iiiint \oiint +\oiiint \varointclockwise \ointctrclockwise \fint \sumint \sqint +\end{verbatim} +The three sizes of the upright integrals look like: +\begin{center} + \begin{tabular}{@{} cl @{}} + \hline + Glyph & Command\\ + \hline + $\smallintup$ & \verb|\smallint[up]|\\ + $\intup$ & \verb|\int[up]| \\ + $\displaystyle{\intup}$ & \verb|\displaystyle{\int[up]}|\\ + \hline + \end{tabular} +\end{center} +Note that the suffix {\tt up} is not required unless the document's integral style is slanted. You may find the \verb|\smallint| is useful for inline math mode when it is important not to change the line spacing. +\item {\tt smallerops} (new as of version 1.3.) causes big operators other than integrals to render up to 20\% less tall, so that displayed formulas may occupy less vertical space. For example, in the following display, the first operator is the usual \verb|\sum|, the second is what you would get with {\tt smallerops}, the third is \verb|\textstyle{\sum}| and the fourth is \verb|\smallsum|, the latter being used mainly with inline math. +\[\sum \Sumop \textstyle{\sum} \smallsum\] +Similarly, there are \verb|\smallprod| and \verb|\smallcoprod| which, along with \verb|\smallsum|, are of class {\tt mathop}, unlike their Greek letter equivalents. +\item (New as of version 1.3.) Two new commands are provided to modify {\tt fontdimen} values in math mode: \verb|\setSYdimens| and \verb|\setEXdimens|, which allow you to change the {\tt fontdimen} parameters for the {\tt symbol} and {\tt extension} fonts respectively. They may be used only in your preamble. Their arguments can be any valid \TeX\ commands to change {\tt fontdimen} values. For example: +\begin{verbatim} +\setSYdimens{\fontdimen16\font=2pt\fontdimen17\font=2pt } +\end{verbatim} +Don't use these unless you know what you're doing. \item \begin{itemize} \item{\tt varg} causes the math italic letter $g$ to be replaced by $\varg$; -\item{\tt cmintegrals} instructs \textsf{newpxmath} to load a thicker version of the Computer Modern integral in place of the \textsf{newpxmath} default---the pxfonts 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{pxfonts} integrals are available; +\item{\tt cmintegrals} instructs \textsf{newpxmath} to load a thicker version of the Computer Modern integral in place of the \textsf{newpxmath} default---the pxfonts 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{pxfonts} integrals are available; \textbf{As of version 1.3, this option does nothing, as the new default is slanted integrals.} \item The option {\tt cmbraces} instructs {\tt newpxmath} to ignore the brace collections from {\tt pxfonts}, substituting a collection based on thickened versions of the Computer Modern braces, which I find much easier to distinguish from other delimiters. This works quite well in regular weight but looks a bit clunky in bold. \item [NEW] The new option {\tt bigdelims} offers delimiters which are a bit larger than the standard delimiters and the normal and {\tt big} sizes, with more distinction between the two than in the standard package. With {\tt bigdelims}, the option {\tt cmbraces} is ignored. \end{itemize} @@ -203,15 +236,16 @@ loads the math part of the {\tt pxfonts} (with revised metrics and additional gl \usepackage{amsmath}% loads amstext, amsbsy, amsopn but not amssymb \usepackage{newpxmath} \end{verbatim} -causes no error, unlike the same combination with {\tt pxfonts}, but does nothing significant. The package {\tt newpxmath} loads the package {\tt amsmath} if it was not previously loaded. Options to {\tt amsmath} such as {\tt leqno,intlimits} may be passed to {\tt amsmath} via options to the documentclass. The integrals are as defined in {\tt pxfonts}. With -\begin{verbatim} -\usepackage[cmintegrals]{newpxmath} -\end{verbatim} -you may 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 newpxmath}. +causes no error, unlike the same combination with {\tt pxfonts}, but does nothing significant. The package {\tt newpxmath} loads the package {\tt amsmath} if it was not previously loaded. Options to {\tt amsmath} such as {\tt leqno,intlimits} may be passed to {\tt amsmath} via options to the documentclass. +%The integrals are as defined in {\tt pxfonts}. %With +%\begin{verbatim} +%\usepackage[cmintegrals]{newpxmath} +%\end{verbatim} +%you may 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 newpxmath}. \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, and \verb|\Deltait|, \verb|zetait| give you italic (i.e., slanted) versions of those letters, and \verb|\mathnormal{\Omega}| etc will always produce the slanted version of uppercase Greek letters. (The macro \verb|\mathnormal| means essentially ``use the version of the symbol in {\tt letters}''---i.e., the math italic form. This did not always work as expected in versions prior to 1.27.) \item The \textsf{newpxmath} package contains three different Blackboard Bold alphabets, where original \textsf{pxfonts} contained one. 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{pxfonts}, is triggered by \verb|\varmathbb{}|, is more geometric and, in my opinion, preferable but not optimal. The option {\tt varbb} makes \verb|\mathbb{}| synonymous with \verb|\varmathbb{}|. The third option is the double-struck glyphs from the STIX collection. See the expanded discussion below. \item {\tt nosymbolsc} causes the package to not load the {\tt symbolsC} fonts, saving a math family. (This font contains mostly exotic symbols, along with some very useful, commonly used symbols like \verb|\coloneq| $\coloneq$, \verb|\eqcolon| $\eqcolon$, \verb|\notin| $\notin$, \verb|\notni| $\notni$, \verb|\neq| $\neq$, \verb|\nsubset| $\nsubset$ and \verb|\nsupset| $\nsupset$, but these have been moved (virtually) to {\tt lettersA} so they may continue to be used even if you use the option {\tt nosymbolsc}.) -\item {\tt amssymbols} (the default) and {\tt noamssymbols} determine whether the {\tt pxfonts} versions of the \textsc{ams} symbols ({\tt msam}, {\tt msbm}) are loaded---if so, they override previous settings in {\tt amsmath}. If you use the option {\tt noamssymbols}, then \verb|\mathbb{}| is set to mean the same as \verb|\varmathbb{}|. (One advantage of {\tt noamssymbols} is that you save two of your precious math families for other purposes, such as setting a couple of external math alphabets by means of the \textsf{mathalfa} package.) +\item {\tt amssymbols} (the default) and {\tt noamssymbols} determine whether the {\tt pxfonts} versions of the \textsc{ams} symbols ({\tt msam}, {\tt msbm}) are loaded---if so, they override previous settings in {\tt amsmath}. If you use the option {\tt noamssymbols}, then \verb|\mathbb{}| is set to mean the same as \verb|\varmathbb{}|. (One advantage of {\tt noamssymbols} is that you save one of your precious math families for other purposes, such as setting a couple of external math alphabets by means of the \textsf{mathalfa} package.) \end{itemize} \textsc{Example:} @@ -219,7 +253,7 @@ you may use the forms \verb|\iint|, \verb|\iiint|, \verb|\iiiint| and \verb|\ido \documentclass[leqno]{article} \usepackage[osf,theoremfont]{newpxtext} % T1, lining figures in math, osf in text \usepackage{textcomp} % required for special glyphs -\usepackage[varg,cmintegrals,bigdelims]{newpxmath} +\usepackage[varg,bigdelims]{newpxmath} \usepackage[scr=rsfso]{mathalfa}% \mathscr is fancier than \mathcal \usepackage{bm} % load after all math to give access to bold math %\useosf %no longer needed unless using babel @@ -249,7 +283,7 @@ Math font packages in \LaTeX\ are susceptible to the ``Too many math alphabets'' \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 if you typeset an expression that, say, calls for a single bold glyph from {\tt symbolsC}, that costs you an entire new slot, leaving only two remaining; -\item same with, eg, \verb|\mathit|; +\item same with, e.g., \verb|\mathit|; \item same with an external Fraktur, Blackboard Bold or Script glyphs; \item if you run out of math alphabets, look first to dropping {\tt AMSm} and {\tt symbolsC}, which can save you at least two slots; \item if space is tight, do not call bold versions of the fonts listed above where the bold version is not already loaded, to avoid loading a new mathgroup; @@ -329,5 +363,6 @@ Variant 2 & \verb|$\vvmathbb{R}}$| $\vvmathbb{R}$& \verb|{\boldmath $\vvmathbb{R \end{tabular} \end{center} +For further information on the changes made to \texttt{newpxmath} 1.3, see the appendix to the documentation for \texttt{newtxmath} 1.5. \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map b/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map index b7d0256f9ec..1940f35c6ce 100644 --- a/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map +++ b/Master/texmf-dist/fonts/map/dvips/newpx/newpx.map @@ -164,3 +164,5 @@ zpl-Regular-tlf-scl-t1 zplr " encntx-ec-tlf-sc ReEncodeFont " <[ntx-ec-tlf-sc.en zpl-Regular-tosf-scl-ly1 zplr " encntx-texnansi-tosf-sc ReEncodeFont " <[ntx-texnansi-tosf-sc.enc <zplr.pfb zpl-Regular-tosf-scl-ot1 zplr " encntx-ot1-tosf-sc ReEncodeFont " <[ntx-ot1-tosf-sc.enc <zplr.pfb zpl-Regular-tosf-scl-t1 zplr " encntx-ec-tosf-sc ReEncodeFont " <[ntx-ec-tosf-sc.enc <zplr.pfb +pxsys pxsys <pxsys.pfb +pxbsys pxbsys <pxbsys.pfb diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm Binary files differnew file mode 100644 index 00000000000..d3a878fa70c --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newpx/pxbsys.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/pxsys.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/pxsys.tfm Binary files differnew file mode 100644 index 00000000000..6995da98e5d --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/newpx/pxsys.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbexa.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbexa.tfm Binary files differindex 1910ea98f48..aedbe9c04b6 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbexa.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbexa.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm Binary files differindex 28ebee9a919..a5ac5695ebf 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbexx.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm Binary files differindex 3a72002cdaa..bd8d66fe7ea 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplbsy.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplexa.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplexa.tfm Binary files differindex a362b42a2c5..e52a4435028 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplexa.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplexa.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm Binary files differindex 17ab23c83d8..4a35d9165fd 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplexx.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/newpx/zplsy.tfm b/Master/texmf-dist/fonts/tfm/public/newpx/zplsy.tfm Binary files differindex 6a2070ad86c..58fd387800e 100644 --- a/Master/texmf-dist/fonts/tfm/public/newpx/zplsy.tfm +++ b/Master/texmf-dist/fonts/tfm/public/newpx/zplsy.tfm diff --git a/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb b/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb Binary files differnew file mode 100644 index 00000000000..ad6acc0c68f --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newpx/pxbsys.pfb diff --git a/Master/texmf-dist/fonts/type1/public/newpx/pxsys.pfb b/Master/texmf-dist/fonts/type1/public/newpx/pxsys.pfb Binary files differnew file mode 100644 index 00000000000..db9662ff5bb --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/newpx/pxsys.pfb diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplbexa.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplbexa.vf Binary files differindex 4123c425f9e..4520e4dee49 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplbexa.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplbexa.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplbexx.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplbexx.vf Binary files differindex 3e51640d691..d2921244dad 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplbexx.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplbexx.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplbsy.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplbsy.vf Binary files differindex 78a41b8396a..14e62f35eb5 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplbsy.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplbsy.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplexa.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplexa.vf Binary files differindex 0e31fca7eaa..e45d43a2aef 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplexa.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplexa.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplexx.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplexx.vf Binary files differindex 48fd0b0559a..279d17ee0dc 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplexx.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplexx.vf diff --git a/Master/texmf-dist/fonts/vf/public/newpx/zplsy.vf b/Master/texmf-dist/fonts/vf/public/newpx/zplsy.vf Binary files differindex 6a37c5dd0f7..8cd6180c472 100644 --- a/Master/texmf-dist/fonts/vf/public/newpx/zplsy.vf +++ b/Master/texmf-dist/fonts/vf/public/newpx/zplsy.vf diff --git a/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd b/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd new file mode 100644 index 00000000000..0c96902b5a1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/lmsnpxsy.fd @@ -0,0 +1,28 @@ +%Filename: lmsnpxsy.fd +%Created by: tex px-sy-drv +%Created using fontinst v1.933 + +%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY + +\ProvidesFile{lmsnpxsy.fd} + [2016/08/13 Fontinst v1.933 font definitions for LMS/npxsy.] + +\expandafter\ifx\csname npxmath@scaled\endcsname\relax + \let\npxmath@@scaled\@empty% +\else + \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% +\fi + +\DeclareFontFamily{LMS}{npxsy}{\providecommand {\setSYdimens}{}\setSYdimens\skewchar \font =120} + +\DeclareFontShape{LMS}{npxsy}{m}{n}{ + <-> \npxmath@@scaled zplsy +}{} + +\DeclareFontShape{LMS}{npxsy}{b}{n}{ + <-> \npxmath@@scaled zplbsy +}{} + +\DeclareFontShape{LMS}{npxsy}{bx}{n}{<->ssub * npxsy/b/n}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd b/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd new file mode 100644 index 00000000000..c3325abea84 --- /dev/null +++ b/Master/texmf-dist/tex/latex/newpx/lmxnpxexx.fd @@ -0,0 +1,28 @@ +%Filename: lmxnpxexx.fd +%Created by: tex px-exx-drv +%Created using fontinst v1.933 + +%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY + +\ProvidesFile{lmxnpxexx.fd} + [2016/08/13 Fontinst v1.933 font definitions for LMX/npxexx.] + +\expandafter\ifx\csname npxmath@scaled\endcsname\relax + \let\npxmath@@scaled\@empty% +\else + \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% +\fi + +\DeclareFontFamily{LMX}{npxexx}{\providecommand {\setSYdimens}{}\setSYdimens} + +\DeclareFontShape{LMX}{npxexx}{m}{n}{ + <-> \npxmath@@scaled zplexx +}{} + +\DeclareFontShape{LMX}{npxexx}{b}{n}{ + <-> \npxmath@@scaled zplbexx +}{} + +\DeclareFontShape{LMX}{npxexx}{bx}{n}{<->ssub * npxexx/b/n}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty index dc8d08d2822..feb4be56629 100644 --- a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty +++ b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty @@ -11,8 +11,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.295} -\def\filedate{2016/02/11} +\def\fileversion{1.3} +\def\filedate{2016/08/12} \ProvidesPackage{newpxmath} [\filedate\space v\fileversion] %\@ifundefined{newpxmathLoaded}{}{\endinput} @@ -36,6 +36,8 @@ \noexpand\setkeys{npxmath}{\CurrentOption}}% \x} \DeclareOption{varg}{\def\X@s@v@rg{}} +\newif\ifpx@upint %default is sloped +\newif\ifpx@smops %default is large binary operators \newcount\px@Isdigit \newif\ifpx@ams \newif\ifpx@slantedG \newif\ifpx@cmint \newif\ifpx@braces \newif\ifpx@varbb \newif\ifpx@vvarbb \newif\ifpx@symbolsC \newif\ifpx@bigdelims \newif\ifpx@frenchm % french math @@ -51,6 +53,8 @@ \DeclareOption{uprightGreek}{\px@slantedGfalse} \DeclareOption{slantedGreek}{\px@slantedGtrue} \DeclareOption{frenchmath}{\px@frenchmtrue} +\DeclareOption{upint}{\px@upinttrue} +\DeclareOption{smallerops}{\px@smopstrue} \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* @@ -99,16 +103,16 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%% % Math Symbol % %%%%%%%%%%%%%%% - -\DeclareSymbolFont{symbols}{OMS}{npxsy}{m}{n} -\SetSymbolFont{symbols}{bold}{OMS}{npxsy}{b}{n} -\DeclareFontSubstitution{OMS}{npxsy}{m}{n} +\DeclareFontEncoding{LMS}{}{} +\DeclareFontSubstitution{LMS}{npxsy}{m}{n} +\DeclareSymbolFont{symbols}{LMS}{npxsy}{m}{n} +\SetSymbolFont{symbols}{bold}{LMS}{npxsy}{b}{n} \DeclareSymbolFontAlphabet{\symb@ls@lph@}{symbols} \ifx\AmSfont\@undefined\else \renewcommand{\AmSfont}{{% - \usefont{OMS}{npxsy}{\if\@xp\@car\f@series\@nil bb\else m\fi}{n}}} + \usefont{LMS}{npxsy}{\if\@xp\@car\f@series\@nil bb\else m\fi}{n}}} \fi @@ -150,29 +154,21 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%%%%% % no OMX used -\expandafter\ifx\csname npxmath@scaled\endcsname\relax - \let\npxmath@@scaled\@empty% -\else - \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% -\fi +%\expandafter\ifx\csname npxmath@scaled\endcsname\relax +% \let\npxmath@@scaled\@empty% +%\else +% \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% +%\fi \DeclareFontEncoding{LMX}{}{} \DeclareFontSubstitution{LMX}{npxexx}{m}{n} -\DeclareFontFamily{LMX}{npxexx}{} -\DeclareFontShape{LMX}{npxexx}{m}{n}{<-> \npxmath@@scaled zplexx}{} -\DeclareFontShape{LMX}{npxexx}{b}{n}{<-> \npxmath@@scaled zplbexx}{} -\DeclareFontShape{LMX}{npxexx}{bx}{n}{<->ssub npxexx/b/n}{} +%\DeclareFontFamily{LMX}{npxexx}{} +%\DeclareFontShape{LMX}{npxexx}{m}{n}{<-> \npxmath@@scaled zplexx}{} +%\DeclareFontShape{LMX}{npxexx}{b}{n}{<-> \npxmath@@scaled zplbexx}{} +%\DeclareFontShape{LMX}{npxexx}{bx}{n}{<->ssub npxexx/b/n}{} \DeclareSymbolFont{largesymbols}{LMX}{npxexx}{m}{n} \SetSymbolFont{largesymbols}{bold}{LMX}{npxexx}{b}{n} -\ifpx@bigdelims - %default definitions of \big etc need some changes - %\renewcommand{\big}{\bBigg@\@ne} - \AtBeginDocument{\renewcommand{\Big}{\bBigg@{1.3}} - \renewcommand{\bigg}{\bBigg@{1.73}} - \renewcommand{\Bigg}{\bBigg@{2.16}} - } -\fi% %%%%%%%%%%%%%%%%%%%% % Math Extension A % %%%%%%%%%%%%%%%%%%%% @@ -197,6 +193,10 @@ amssymbols,uprightGreek} \let#1=\undefined \DeclareMathAccent{#1}{#2}{#3}{#4}} +\def\re@DeclareMathRadical#1#2#3#4{% + \let#1=\undefined + \DeclareMathRadical{#1}{#2}{#3}{#4}} + \def\DeclareMathSymbolCtr#1#2#3#4{% \DeclareMathSymbol{#1}{#2}{#3}{#4} \advance #4 by1} @@ -210,6 +210,9 @@ amssymbols,uprightGreek} \fi% \fi% } +\DeclareRobustCommand{\BI@}[1]{% +\begingroup\text{\mathversion{bold}$#1$}\endgroup} +%\DeclareRobustCommand{\BIA}{\BI@{A}} % etc \def\px@XXX#1#2\@nil{% #1=first character, #2=rest of string \px@isdigit{#1}% @@ -260,39 +263,45 @@ amssymbols,uprightGreek} %\DeclareMathDelimiter{)}{\mathclose}{operators}{41}{largesymbols}{1} %\DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0} %\DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1} -\ifpx@bigdelims - \DeclareMathDelimiter{(}{\mathopen}{lettersA}{155}{largesymbols}{130} - \DeclareMathDelimiter{)}{\mathclose}{lettersA}{156}{largesymbols}{131} - \DeclareMathDelimiter{[}{\mathopen}{lettersA}{157}{largesymbols}{132} - \DeclareMathDelimiter{]}{\mathclose}{lettersA}{158}{largesymbols}{133} - \DeclareMathDelimiter{\lfloor}{\mathopen}{lettersA}{159}{largesymbols}{134} - \DeclareMathDelimiter{\rfloor}{\mathclose}{lettersA}{160}{largesymbols}{135} - \DeclareMathDelimiter{\lceil}{\mathopen}{lettersA}{161}{largesymbols}{136} - \DeclareMathDelimiter{\rceil}{\mathclose}{lettersA}{162}{largesymbols}{137} - \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{163}{largesymbols}{138} - \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{164}{largesymbols}{139} - \DeclareMathDelimiter{\langle}{\mathopen}{lettersA}{165}{largesymbols}{140} - %\DeclareMathDelimiter{<}{\mathopen}{lettersA}{165}{largesymbols}{140} - \DeclareMathDelimiter{\rangle}{\mathclose}{lettersA}{166}{largesymbols}{141} - %\DeclareMathDelimiter{>}{\mathclose}{lettersA}{166}{largesymbols}{141} - \DeclareMathSymbol{\mid}{\mathrel}{lettersA}{96} - \DeclareMathDelimiter{|}{\mathord}{lettersA}{96}{largesymbols}{128} - \DeclareMathDelimiter{\arrowvert}{\mathord}{lettersA}{167}{largesymbols}{60} - \DeclareMathDelimiter{\vert}{\mathord}{lettersA}{96}{largesymbols}{128} - %\DeclareMathSymbol{\parallel}{\mathrel}{lettersA}{129} - \DeclareMathDelimiter{\Arrowvert}{\mathord}{lettersA}{168}{largesymbols}{61} - \DeclareMathDelimiter{\Vert}{\mathord}{lettersA}{128}{largesymbols}{129} +%\ifpx@bigdelims + \DeclareMathDelimiter{\lgroup}{\mathopen}{largesymbols}{58}{largesymbols}{58} + \DeclareMathDelimiter{\rgroup}{\mathclose}{largesymbols}{59}{largesymbols}{59} + \DeclareMathDelimiter{\lmoustache}{\mathopen}{largesymbols}{64}{largesymbols}{64} + \DeclareMathDelimiter{\rmoustache}{\mathclose}{largesymbols}{65}{largesymbols}{65} + \DeclareMathDelimiter{/}{\mathopen}{symbols}{157}{largesymbols}{14} + \DeclareMathDelimiter{(}{\mathopen}{symbols}{185}{largesymbols}{0} + \DeclareMathDelimiter{)}{\mathclose}{symbols}{186}{largesymbols}{1} + \DeclareMathDelimiter{[}{\mathopen}{symbols}{187}{largesymbols}{2} + \DeclareMathDelimiter{]}{\mathclose}{symbols}{188}{largesymbols}{3} + \DeclareMathDelimiter{\lfloor}{\mathopen}{symbols}{98}{largesymbols}{4} + \DeclareMathDelimiter{\rfloor}{\mathclose}{symbols}{99}{largesymbols}{5} + \DeclareMathDelimiter{\lceil}{\mathopen}{symbols}{100}{largesymbols}{6} + \DeclareMathDelimiter{\rceil}{\mathclose}{symbols}{101}{largesymbols}{7} + \DeclareMathDelimiter{\lbrace}{\mathopen}{symbols}{102}{largesymbols}{8} + \DeclareMathDelimiter{\rbrace}{\mathclose}{symbols}{103}{largesymbols}{9} + \DeclareMathDelimiter{\langle}{\mathopen}{symbols}{104}{largesymbols}{10} + %\DeclareMathDelimiter{<}{\mathopen}{letters}{60}{largesymbols}{140} + \DeclareMathDelimiter{\rangle}{\mathclose}{symbols}{105}{largesymbols}{11} + %\DeclareMathDelimiter{>}{\mathclose}{letters}{62}{largesymbols}{141} + \DeclareMathSymbol{\mid}{\mathrel}{symbols}{106} + \DeclareMathDelimiter{|}{\mathord}{symbols}{106}{largesymbols}{12} + \DeclareMathDelimiter{\arrowvert}{\mathord}{symbols}{106}{largesymbols}{60} + \DeclareMathDelimiter{\vert}{\mathord}{symbols}{106}{largesymbols}{12} + \DeclareMathSymbol{\parallel}{\mathrel}{symbols}{107} + \DeclareMathDelimiter{\Arrowvert}{\mathord}{symbols}{107}{largesymbols}{61} + \DeclareMathDelimiter{\Vert}{\mathord}{symbols}{107}{largesymbols}{13} \let\|=\Vert - \DeclareMathDelimiter{\updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{63} - \DeclareMathDelimiter{\Updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{119} -\else - \ifpx@braces - \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{142} - \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{143} - \fi - \DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0} - \DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1} -\fi + \DeclareMathDelimiter{\updownarrow}{\mathrel}{symbols}{108}{largesymbols}{63} + \DeclareMathDelimiter{\Updownarrow}{\mathrel}{symbols}{109}{largesymbols}{119} + \DeclareMathDelimiter{\llbracket}{\mathopen}{lettersA}{251}{largesymbolsPXA}{18} + \let\lBrack=\llbracket + \DeclareMathDelimiter{\rrbracket}{\mathclose}{lettersA}{252}{largesymbolsPXA}{19} + \let\rBrack=\rrbracket +\DeclareMathDelimiter{\lvert} {\mathopen} {symbols}{106}{largesymbols}{12} +\DeclareMathDelimiter{\rvert} {\mathclose} {symbols}{106}{largesymbols}{12} +\DeclareMathDelimiter{\lVert} {\mathopen} {symbols}{107}{largesymbols}{13} +\DeclareMathDelimiter{\rVert} {\mathclose} {symbols}{107}{largesymbols}{13} +%\fi \DeclareMathSymbol{+}{\mathbin}{lettersA}{253} %\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14} %\DeclareMathSymbol{:}{\mathrel}{operators}{58} @@ -306,7 +315,11 @@ amssymbols,uprightGreek} %\DeclareMathAccent{\dot}{\mathalpha}{operators}{95} %\DeclareMathAccent{\tilde}{\mathalpha}{operators}{126} %\DeclareMathAccent{\ddot}{\mathalpha}{operators}{127} -%\ifx\encodingdefault\t@one% +\re@DeclareMathAccent{\dot}{\mathalpha}{symbols}{219} +\re@DeclareMathAccent{\ddot}{\mathalpha}{symbols}{220} +\re@DeclareMathAccent{\dddot}{\mathord}{symbols}{221} +\re@DeclareMathAccent{\ddddot}{\mathord}{symbols}{222} +\ifx\encodingdefault\t@one% % \re@DeclareMathAccent{\grave}{\mathalpha}{operators}{0} % \re@DeclareMathAccent{\acute}{\mathalpha}{operators}{1} % \re@DeclareMathAccent{\check}{\mathalpha}{operators}{7} @@ -488,14 +501,14 @@ amssymbols,uprightGreek} %\DeclareMathSymbol{\spadesuit}{\mathord}{symbols}{127} % Define \overgroup, \undergroup, like \overbrace, \underbrace -\DeclareMathSymbol{\groupld}{\mathord}{largesymbols}{160} -\DeclareMathSymbol{\grouprd}{\mathord}{largesymbols}{161} -\DeclareMathSymbol{\grouplu}{\mathord}{largesymbols}{162} -\DeclareMathSymbol{\groupru}{\mathord}{largesymbols}{163} -\DeclareMathSymbol{\grouplda}{\mathord}{largesymbols}{164} -\DeclareMathSymbol{\grouprda}{\mathord}{largesymbols}{165} -\DeclareMathSymbol{\grouplua}{\mathord}{largesymbols}{166} -\DeclareMathSymbol{\grouprua}{\mathord}{largesymbols}{167} +\DeclareMathSymbol{\groupld}{\mathord}{symbols}{160} +\DeclareMathSymbol{\grouprd}{\mathord}{symbols}{161} +\DeclareMathSymbol{\grouplu}{\mathord}{symbols}{162} +\DeclareMathSymbol{\groupru}{\mathord}{symbols}{163} +\DeclareMathSymbol{\grouplda}{\mathord}{symbols}{164} +\DeclareMathSymbol{\grouprda}{\mathord}{symbols}{165} +\DeclareMathSymbol{\grouplua}{\mathord}{symbols}{166} +\DeclareMathSymbol{\grouprua}{\mathord}{symbols}{167} % Override default definitions of \widehat and \widetilde %\re@DeclareMathAccent{\widehat}{\mathalpha}{largesymbols}{98} %\re@DeclareMathAccent{\widetilde}{\mathalpha}{largesymbols}{101} @@ -552,11 +565,231 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \hbox{$\mathring{}$}}}}{\overgroup{#1}}} % \widearc, \wideOarc -\DeclareMathAccent{\widearc}{\mathalpha}{largesymbols}{175} -\DeclareMathAccent{\wideOarc}{\mathalpha}{largesymbols}{180} +\DeclareMathAccent{\widearc}{\mathalpha}{symbols}{175} +\DeclareMathAccent{\wideOarc}{\mathalpha}{symbols}{180} + +%%%%%%%%%%%% +%Integrals +%%%%%%%%%%%% +%\def\surd{{\mathchar"13F9}} +\re@DeclareMathSymbol{\smallintsl} {\mathop}{symbols}{"80} +\re@DeclareMathSymbol{\smalliintsl} {\mathop}{symbols}{"81} +\re@DeclareMathSymbol{\smalliiintsl} {\mathop}{symbols}{"82} +\re@DeclareMathSymbol{\smallointsl} {\mathop}{symbols}{"83} +\re@DeclareMathSymbol{\smalloiintsl} {\mathop}{symbols}{"84} +\re@DeclareMathSymbol{\smalloiiintsl} {\mathop}{symbols}{"85} +\re@DeclareMathSymbol{\smallvarointclockwisesl}{\mathop}{symbols}{"86} +\re@DeclareMathSymbol{\smallointctrclockwisesl}{\mathop}{symbols}{"87} +\re@DeclareMathSymbol{\smallsumintsl} {\mathop}{symbols}{"88} +\re@DeclareMathSymbol{\smalliiiintsl} {\mathop}{symbols}{"89} +\re@DeclareMathSymbol{\smallfintsl} {\mathop}{symbols}{"8A} +\re@DeclareMathSymbol{\smallsqintsl} {\mathop}{symbols}{"8B} + +\re@DeclareMathSymbol{\smallintup} {\mathop}{symbols}{"8C} +\re@DeclareMathSymbol{\smalliintup} {\mathop}{symbols}{"8D} +\re@DeclareMathSymbol{\smalliiintup} {\mathop}{symbols}{"8E} +\re@DeclareMathSymbol{\smallointup} {\mathop}{symbols}{"8F} +\re@DeclareMathSymbol{\smalloiintup} {\mathop}{symbols}{"90} +\re@DeclareMathSymbol{\smalloiiintup} {\mathop}{symbols}{"91} +\re@DeclareMathSymbol{\smallvarointclockwiseup}{\mathop}{symbols}{"92} +\re@DeclareMathSymbol{\smallointctrclockwiseup}{\mathop}{symbols}{"93} +\re@DeclareMathSymbol{\smallsumintup} {\mathop}{symbols}{"94} +\re@DeclareMathSymbol{\smalliiiintup} {\mathop}{symbols}{"95} +\re@DeclareMathSymbol{\smallfintup} {\mathop}{symbols}{"96} +\re@DeclareMathSymbol{\smallsqintup} {\mathop}{symbols}{"97} + +\re@DeclareMathSymbol{\intslop} {\mathop}{largesymbols}{"AF} +\re@DeclareMathSymbol{\iintslop} {\mathop}{largesymbols}{"B0} +\re@DeclareMathSymbol{\iiintslop} {\mathop}{largesymbols}{"B1} +\re@DeclareMathSymbol{\ointslop} {\mathop}{largesymbols}{"B2} +\re@DeclareMathSymbol{\oiintslop} {\mathop}{largesymbols}{"B3} +\re@DeclareMathSymbol{\oiiintslop} {\mathop}{largesymbolsPXA}{"40} +\re@DeclareMathSymbol{\varointclockwiseslop} {\mathop}{largesymbolsPXA}{"42} +\re@DeclareMathSymbol{\ointctrclockwiseslop} {\mathop}{largesymbolsPXA}{"44} +\re@DeclareMathSymbol{\sumintslop} {\mathop}{largesymbolsPXA}{"46} +\re@DeclareMathSymbol{\iiiintslop} {\mathop}{largesymbolsPXA}{"48} +\re@DeclareMathSymbol{\fintslop} {\mathop}{largesymbolsPXA}{"4A} +\re@DeclareMathSymbol{\sqintslop} {\mathop}{largesymbolsPXA}{"4C} + +\re@DeclareMathSymbol{\intupop} {\mathop}{largesymbols}{"B4} +\re@DeclareMathSymbol{\iintupop} {\mathop}{largesymbols}{"B5} +\re@DeclareMathSymbol{\iiintupop} {\mathop}{largesymbols}{"B6} +\re@DeclareMathSymbol{\ointupop} {\mathop}{largesymbols}{"B7} +\re@DeclareMathSymbol{\oiintupop} {\mathop}{largesymbols}{"B8} +\re@DeclareMathSymbol{\oiiintupop} {\mathop}{largesymbolsPXA}{"08} +\re@DeclareMathSymbol{\varointclockwiseupop} {\mathop}{largesymbolsPXA}{"0A} +\re@DeclareMathSymbol{\ointctrclockwiseupop} {\mathop}{largesymbolsPXA}{"0C} +\re@DeclareMathSymbol{\sumintupop} {\mathop}{largesymbolsPXA}{"0E} +\re@DeclareMathSymbol{\iiiintupop} {\mathop}{largesymbolsPXA}{"21} +\re@DeclareMathSymbol{\fintupop} {\mathop}{largesymbolsPXA}{"23} +\re@DeclareMathSymbol{\sqintupop} {\mathop}{largesymbolsPXA}{"25} + +\ifpx@upint + \let\smallint=\smallintup + \let\smalliint=\smalliintup + \let\smalliiint=\smalliiintup + \let\smalloint=\smallointup + \let\smalloiint=\smalloiintup + \let\smalloiiint=\smalloiiintup + \let\smallvarointclockwise=\smallvarointclockwiseup + \let\smallointctrclockwise=\smallointctrclockwiseup + \let\smallsumint=\smallsumintup + \let\smalliiiint=\smalliiiintup + \let\smallfint=\smallfintup + \let\smallsqint=\smallsqintup + + \let\intop=\intupop + \let\iintop=\iintupop + \let\iiintop=\iiintupop + \let\ointop=\ointupop + \let\oiintop=\oiintupop + \let\oiiintop=\oiiintupop + \let\varointclockwiseop=\varointclockwiseupop + \let\ointctrclockwiseop=\ointctrclockwiseupop + \let\sumintop=\sumintupop + \let\iiiintop=\iiiintupop + \let\fintop=\fintupop + \let\sqintop=\sqintupop +\else + \let\smallint=\smallintsl + \let\smalliint=\smalliintsl + \let\smalliiint=\smalliiintsl + \let\smalloint=\smallointsl + \let\smalloiint=\smalloiintsl + \let\smalloiiint=\smalloiiintsl + \let\smallvarointclockwise=\smallvarointclockwisesl + \let\smallointctrclockwise=\smallointctrclockwisesl + \let\smallsumint=\smallsumintsl + \let\smalliiiint=\smalliiiintsl + \let\smallfint=\smallfintsl + \let\smallsqint=\smallsqintsl + + \let\intop=\intslop + \let\iintop=\iintslop + \let\iiintop=\iiintslop + \let\ointop=\ointslop + \let\oiintop=\oiintslop + \let\oiiintop=\oiiintslop + \let\varointclockwiseop=\varointclockwiseslop + \let\ointctrclockwiseop=\ointctrclockwiseslop + \let\sumintop=\sumintslop + \let\iiiintop=\iiiintslop + \let\fintop=\fintslop + \let\sqintop=\sqintslop +\fi +\def\int{\DOTSI\intop\ilimits@} +\def\iint{\DOTSI\iintop\ilimits@} +\def\iiint{\DOTSI\iiintop\ilimits@} +\def\oint{\DOTSI\ointop\ilimits@} +\def\oiint{\DOTSI\oiintop\ilimits@} +\def\oiiint{\DOTSI\oiiintop\ilimits@} +\def\varointclockwise{\DOTSI\varointclockwiseop\ilimits@} +\def\ointctrclockwise{\DOTSI\ointctrclockwiseop\ilimits@} +\def\sumint{\DOTSI\sumintop\ilimits@} +\def\iiiint{\DOTSI\iiiintop\ilimits@} +\def\fint{\DOTSI\fintop\ilimits@} +\def\sqint{\DOTSI\sqintop\ilimits@} + \let\ointclockwise=\varointclockwise + +\def\intsl{\DOTSI\intslop\ilimits@} +\def\iintsl{\DOTSI\iintslop\ilimits@} +\def\iiintsl{\DOTSI\iiintslop\ilimits@} +\def\ointsl{\DOTSI\ointslop\ilimits@} +\def\oiintsl{\DOTSI\oiintslop\ilimits@} +\def\oiiintsl{\DOTSI\oiiintslop\ilimits@} +\def\varointclockwisesl{\DOTSI\varointclockwiseslop\ilimits@} +\def\ointctrclockwisesl{\DOTSI\ointctrclockwiseslop\ilimits@} +\def\sumintsl{\DOTSI\sumintslop\ilimits@} +\def\iiiintsl{\DOTSI\iiiintslop\ilimits@} +\def\fintsl{\DOTSI\fintslop\ilimits@} +\def\sqintsl{\DOTSI\sqintslop\ilimits@} + \let\ointclockwisesl=\varointclockwisesl + +\def\intup{\DOTSI\intupop\ilimits@} +\def\iintup{\DOTSI\iintupop\ilimits@} +\def\iiintup{\DOTSI\iiintupop\ilimits@} +\def\ointup{\DOTSI\ointupop\ilimits@} +\def\oiintup{\DOTSI\oiintupop\ilimits@} +\def\oiiintup{\DOTSI\oiiintupop\ilimits@} +\def\varointclockwiseup{\DOTSI\varointclockwiseupop\ilimits@} +\def\ointctrclockwiseup{\DOTSI\ointctrclockwiseupop\ilimits@} +\def\sumintup{\DOTSI\sumintupop\ilimits@} +\def\iiiintup{\DOTSI\iiiintupop\ilimits@} +\def\fintup{\DOTSI\fintupop\ilimits@} +\def\sqintup{\DOTSI\sqintupop\ilimits@} + \let\ointclockwiseup=\varointclockwiseup %%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Math Symbol A Definitions % AMSa +% Math extension options +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\ifpx@smops % use smaller form of binary operators +\re@DeclareMathSymbol{\bigsqcupop}{\mathop}{largesymbols}{"46} +\re@DeclareMathSymbol{\bigodotop}{\mathop}{largesymbols}{"4A} +\re@DeclareMathSymbol{\bigoplusop}{\mathop}{largesymbols}{"4C} +\re@DeclareMathSymbol{\bigotimesop}{\mathop}{largesymbols}{"4E} +\re@DeclareMathSymbol{\sumop}{\mathop}{largesymbols}{"50} +\re@DeclareMathSymbol{\prodop}{\mathop}{largesymbols}{"51} +\re@DeclareMathSymbol{\bigcupop}{\mathop}{largesymbols}{"53} +\re@DeclareMathSymbol{\bigcapop}{\mathop}{largesymbols}{"54} +\re@DeclareMathSymbol{\biguplusop}{\mathop}{largesymbols}{"55} +\re@DeclareMathSymbol{\bigwedgeop}{\mathop}{largesymbols}{"56} +\re@DeclareMathSymbol{\bigveeop}{\mathop}{largesymbols}{"57} +\re@DeclareMathSymbol{\bigcupdotop}{\mathop}{largesymbols}{"DF} +\re@DeclareMathSymbol{\bigcapplusop}{\mathop}{largesymbolsPXA}{"00} +\re@DeclareMathSymbol{\bigsqcupplusop}{\mathop}{largesymbolsPXA}{"02} +\re@DeclareMathSymbol{\bigsqcapplusop}{\mathop}{largesymbolsPXA}{"04} +\re@DeclareMathSymbol{\bigsqcapop}{\mathop}{largesymbolsPXA}{"06} +\re@DeclareMathSymbol{\bigtimesop}{\mathop}{largesymbolsPXA}{"10} +\re@DeclareMathSymbol{\coprodop}{\mathop}{largesymbols}{"60} +%\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsPXA}{0} +%\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsPXA}{2} +%\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsPXA}{4} +%\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsPXA}{6} +%\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsPXA}{16} +\else +\re@DeclareMathSymbol{\bigsqcupop}{\mathop}{largesymbols}{"C3} +\re@DeclareMathSymbol{\bigodotop}{\mathop}{largesymbols}{"C7} +\re@DeclareMathSymbol{\bigoplusop}{\mathop}{largesymbols}{"C9} +\re@DeclareMathSymbol{\bigotimesop}{\mathop}{largesymbols}{"CB} +\re@DeclareMathSymbol{\sumop}{\mathop}{largesymbols}{"CD} +\re@DeclareMathSymbol{\prodop}{\mathop}{largesymbols}{"CE} +\re@DeclareMathSymbol{\bigcupop}{\mathop}{largesymbols}{"D0} +\re@DeclareMathSymbol{\bigcapop}{\mathop}{largesymbols}{"D1} +\re@DeclareMathSymbol{\biguplusop}{\mathop}{largesymbols}{"D2} +\re@DeclareMathSymbol{\bigwedgeop}{\mathop}{largesymbols}{"D3} +\re@DeclareMathSymbol{\bigveeop}{\mathop}{largesymbols}{"D4} +\re@DeclareMathSymbol{\bigcupdotop}{\mathop}{largesymbols}{"CF} +\re@DeclareMathSymbol{\bigcapplusop}{\mathop}{largesymbolsPXA}{"28} +\re@DeclareMathSymbol{\bigsqcupplusop}{\mathop}{largesymbolsPXA}{"2A} +\re@DeclareMathSymbol{\bigsqcapplusop}{\mathop}{largesymbolsPXA}{"2C} +\re@DeclareMathSymbol{\bigsqcapop}{\mathop}{largesymbolsPXA}{"2E} +\re@DeclareMathSymbol{\bigtimesop}{\mathop}{largesymbolsPXA}{"3E} +\re@DeclareMathSymbol{\coprodop}{\mathop}{largesymbols}{"DD} +\fi +\def\prod{\DOTSI\prodop\slimits@} +\def\coprod{\DOTSI\coprodop\slimits@} +\def\sum{\DOTSI\sumop\slimits@} +\def\bigwedge{\DOTSI\bigwedgeop\slimits@} +\def\bigvee{\DOTSI\bigveeop\slimits@} +\def\bigcap{\DOTSI\bigcapop\slimits@} +\def\bigcup{\DOTSI\bigcupop\slimits@} +\def\bigodot{\DOTSI\bigodotop\slimits@} +\def\bigoplus{\DOTSI\bigoplusop\slimits@} +\def\bigotimes{\DOTSI\bigotimesop\slimits@} +\def\bigcupdot{\DOTSI\bigcupdotop\slimits@} +\def\bignplus{\DOTSI\bigcapplusop\slimits@} + \let\bigcapplus=\bignplus +\def\biguplus{\DOTSI\biguplusop\slimits@} + \let\bigcupplus=\biguplus +\def\bigsqcap{\DOTSI\bigsqcapop\slimits@} +\def\bigsqcapplus{\DOTSI\bigsqcapplusop\slimits@} +\def\bigsqcup{\DOTSI\bigsqcupop\slimits@} +\def\bigsqcupplus{\DOTSI\bigsqcupplusop\slimits@} +\def\bigtimes{\DOTSI\bigtimesop\slimits@} + \let\varprod=\bigtimes + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Math Symbol Definitions % AMSm %%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifpx@ams \re@DeclareMathSymbol{\boxdot}{\mathbin}{AMSm}{128} @@ -761,7 +994,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\nleftrightarrow}{\mathrel}{AMSm}{61} \re@DeclareMathSymbol{\divideontimes}{\mathbin}{AMSm}{62} %\re@DeclareMathSymbol{\varnothing}{\mathord}{AMSm}{63} -\re@DeclareMathSymbol{\nexists}{\mathord}{AMSm}{64} +%\re@DeclareMathSymbol{\nexists}{\mathord}{AMSm}{64} \re@DeclareMathSymbol{\Finv}{\mathord}{AMSm}{96} \re@DeclareMathSymbol{\Game}{\mathord}{AMSm}{97} \re@DeclareMathSymbol{\mho}{\mathord}{AMSm}{102} @@ -974,8 +1207,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\multimapdotbothAvert}{\mathrel}{symbolsC}{152} \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}{pxsyc}{m}{n}\char126}}} +\def\drb{\ensuremath\raisebox{.15ex}{\mbox{\usefont{U}{pxsyc}{m}{n}\char127}}} % Changes to put some symbolsC glyphs into lettersA \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{54} \re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{55} @@ -1052,6 +1285,29 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %\DeclareMathSymbol{\wp}{\mathord}{letters}{125} %\DeclareMathAccent{\vec}{\mathord}{letters}{126} %"7F +%Added in version 1.3 +\DeclareMathAccent{\vec}{\mathord}{symbols}{174} +\DeclareMathAccent{\lvec}{\mathord}{symbols}{169} +\DeclareMathAccent{\lrvec}{\mathord}{symbols}{172} +\DeclareMathAccent{\harpoonacc}{\mathord}{symbols}{170} +\DeclareMathAccent{\lharpoonacc}{\mathord}{symbols}{171} +\DeclareMathAccent{\lrharpoonacc}{\mathord}{symbols}{173} +\DeclareMathAccent{\barbar}{\mathord}{symbols}{189} +\DeclareMathAccent{\bartilde}{\mathord}{symbols}{190} +\DeclareMathAccent{\barhat}{\mathord}{symbols}{191} +\DeclareMathAccent{\tildebar}{\mathord}{symbols}{192} +\DeclareMathAccent{\tildetilde}{\mathord}{symbols}{193} +\DeclareMathAccent{\tildehat}{\mathord}{symbols}{194} +\DeclareMathAccent{\hatbar}{\mathord}{symbols}{195} +\DeclareMathAccent{\hattilde}{\mathord}{symbols}{196} +\DeclareMathAccent{\hathat}{\mathord}{symbols}{197} +\DeclareMathSymbol{\cdotB}{\mathord}{symbols}{208} +\DeclareMathSymbol{\cdotBB}{\mathord}{symbols}{209} +\DeclareMathSymbol{\circS}{\mathord}{symbols}{210} +\DeclareMathSymbol{\bulletSSS}{\mathord}{symbols}{211} +\DeclareMathSymbol{\bulletSS}{\mathord}{symbols}{212} +\DeclareMathSymbol{\bulletS}{\mathord}{symbols}{213} +\DeclareMathSymbol{\primeS}{\mathord}{symbols}{214} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Italic A (npxmia) Definition % lettersA @@ -1202,6 +1458,19 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \DeclareMathSymbol{Y}{\mathalpha}{operators}{89} \DeclareMathSymbol{Z}{\mathalpha}{operators}{90} \fi +\re@DeclareMathSymbol{\nexists}{\mathord}{symbols}{"9A} + \let\nexistsAlt=\nexists +\re@DeclareMathSymbol{\exists}{\mathord}{lettersA}{92} + \let\existsAlt=\exists +\re@DeclareMathSymbol{\forall}{\mathord}{lettersA}{91} + \let\forallAlt=\forall +%\DeclareMathSymbol{\forallAlt}{\mathord}{lettersA}{91}%added 20130726 +%\DeclareMathSymbol{\nexistsAlt}{\mathord}{lettersA}{93}%added 20130726 +%\DeclareMathSymbol{\emptysetAlt}{\mathord}{lettersA}{94}%added 20130726 +\re@DeclareMathSymbol{\emptysetAlt}{\mathord}{symbols}{"9B} +\re@DeclareMathSymbol{\varnothing}{\mathord}{symbols}{"9C} +% + \re@DeclareMathSymbol{\Gammait}{\mathalpha}{letters}{0} \re@DeclareMathSymbol{\Deltait}{\mathalpha}{letters}{1} \re@DeclareMathSymbol{\Thetait}{\mathalpha}{letters}{2} @@ -1346,24 +1615,27 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % Math Extension A (npxexa) Definition % largesymbolsPXA %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsPXA}{0} -\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsPXA}{2} -\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsPXA}{4} -\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsPXA}{6} -\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsPXA}{16} +%\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsPXA}{0} +%\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsPXA}{2} +%\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsPXA}{4} +%\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsPXA}{6} +%\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsPXA}{16} %\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsPXA}{18} %\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsPXA}{19} -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsPXA}{32} +\re@DeclareMathSymbol{\br@cext}{\mathord}{symbols}{168} +\DeclareMathSymbol{\smallprod}{\mathop}{symbols}{"98} +\DeclareMathSymbol{\smallsum}{\mathop}{symbols}{"99} +\DeclareMathSymbol{\smallcoprod}{\mathop}{symbols}{113}% % -\ifpx@cmint +%\ifpx@cmint % added 2012-04-16 - \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsPXA}{84} - \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsPXA}{86} +% \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsPXA}{84} +% \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsPXA}{86} % \ifx\AmSfont\@undefined % \def\oint{\ointop\nolimits} % \def\int{\intop\nolimits} % \fi -\else % use px integrals +%\else % use px integrals % \ifx\AmSfont\@undefined\else % % The following are needed if amsmath has been loaded % \let\iint\relax @@ -1371,51 +1643,51 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \let\iiiint\relax % \let\idotsint\relax % \fi -\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsPXA}{8} - \def\oiint{\oiintop\ilimits@} -\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsPXA}{10} - \def\ointctrclockwise{\ointctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsPXA}{12} - \def\ointclockwise{\ointclockwiseop\ilimits@} -\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsPXA}{14} - \def\sqint{\sqintop\ilimits@} -\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsPXA}{33} - \def\iint{\iintop\ilimits@} -\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsPXA}{35} - \def\iiint{\iiintop\ilimits@} -\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsPXA}{37} - \def\iiiint{\iiiintop\ilimits@} -\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsPXA}{39} - \def\idotsint{\idotsintop\ilimits@} -\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsPXA}{41} - \def\oiiint{\oiiintop\ilimits@} -\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsPXA}{43} - \def\varointctrclockwise{\varointctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsPXA}{45} - \def\varointclockwise{\varointclockwiseop\ilimits@} -\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsPXA}{62} - \def\fint{\fintop\ilimits@} -\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsPXA}{64} - \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsPXA}{66} - \def\varoiintclockwise{\varoiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsPXA}{68} - \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsPXA}{70} - \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsPXA}{72} - \def\oiintclockwise{\oiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsPXA}{74} - \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsPXA}{76} - \def\oiiintclockwise{\oiiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsPXA}{78} - \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsPXA}{80} - \def\sqiint{\sqiintop\ilimits@} -\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsPXA}{82} - \def\sqiiint{\sqiiintop\ilimits@} -\fi +%\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsPXA}{8} +% \def\oiint{\oiintop\ilimits@} +%\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsPXA}{10} +% \def\ointctrclockwise{\ointctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsPXA}{12} +% \def\ointclockwise{\ointclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsPXA}{14} +% \def\sqint{\sqintop\ilimits@} +%\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsPXA}{33} +% \def\iint{\iintop\ilimits@} +%\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsPXA}{35} +% \def\iiint{\iiintop\ilimits@} +%\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsPXA}{37} +% \def\iiiint{\iiiintop\ilimits@} +%\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsPXA}{39} +% \def\idotsint{\idotsintop\ilimits@} +%\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsPXA}{41} +% \def\oiiint{\oiiintop\ilimits@} +%\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsPXA}{43} +% \def\varointctrclockwise{\varointctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsPXA}{45} +% \def\varointclockwise{\varointclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsPXA}{62} +% \def\fint{\fintop\ilimits@} +%\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsPXA}{64} +% \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsPXA}{66} +% \def\varoiintclockwise{\varoiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsPXA}{68} +% \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsPXA}{70} +% \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsPXA}{72} +% \def\oiintclockwise{\oiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsPXA}{74} +% \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsPXA}{76} +% \def\oiiintclockwise{\oiiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsPXA}{78} +% \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsPXA}{80} +% \def\sqiint{\sqiintop\ilimits@} +%\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsPXA}{82} +% \def\sqiiint{\sqiiintop\ilimits@} +%\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1456,8 +1728,6 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %%% For \underbrace and \overbrace: %%% use brace extension bar (in "20 of npxexa) instead of vrule -%\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsPXA}{32} -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbols}{168} % \def\downbracefill{$\m@th% \braceld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu% @@ -1535,10 +1805,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \pxf@ntname{boldsymbols} \pxf@ntname{largesymbols} \pxf@ntname{boldlargesymbols} -\pxf@ntname{AMSa} -\pxf@ntname{boldAMSa} -\pxf@ntname{AMSb} -\pxf@ntname{boldAMSb} +\pxf@ntname{AMSm} +\pxf@ntname{boldAMSm} \pxf@ntname{letters} \pxf@ntname{boldletters} \pxf@ntname{lettersA} diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty index e87afc45899..fa336e02861 100644 --- a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty +++ b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty @@ -8,8 +8,8 @@ % Modified the definition of \k to bypass problem with grouping. % Text is now directed to an extension of TeXGyrePagella rather than ppl. -\def\fileversion{1.295} -\def\filedate{2016/02/11} +\def\fileversion{1.3} +\def\filedate{2016/08/12} \ProvidesPackage{newpxtext}[\filedate\space v\fileversion] \message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)} diff --git a/Master/texmf-dist/tex/latex/newpx/omsnpxsy.fd b/Master/texmf-dist/tex/latex/newpx/omsnpxsy.fd deleted file mode 100644 index 8c8b9a92388..00000000000 --- a/Master/texmf-dist/tex/latex/newpx/omsnpxsy.fd +++ /dev/null @@ -1,28 +0,0 @@ -%Filename: omsnpxsy.fd -%Created by: tex px-drv -%Created using fontinst v1.933 - -%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY - -\ProvidesFile{omsnpxsy.fd} - [2013/03/24 Fontinst v1.933 font definitions for OMS/npxsy.] - -\expandafter\ifx\csname npxmath@scaled\endcsname\relax - \let\npxmath@@scaled\@empty% -\else - \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}% -\fi - -\DeclareFontFamily{OMS}{npxsy}{\skewchar \font =120} - -\DeclareFontShape{OMS}{npxsy}{m}{n}{ - <-> \npxmath@@scaled zplsy -}{} - -\DeclareFontShape{OMS}{npxsy}{b}{n}{ - <-> \npxmath@@scaled zplbsy -}{} - -\DeclareFontShape{OMS}{npxsy}{bx}{n}{<->ssub * npxsy/b/n}{} - -\endinput |