From 3b74a8e09fab3387e705efec46b0f364bc146394 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Aug 2016 22:47:03 +0000 Subject: newtxsf (24aug16) git-svn-id: svn://tug.org/texlive/trunk@41918 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtxsf/newtxsf.sty | 435 +++++++++++++++++++----- 1 file changed, 345 insertions(+), 90 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/newtxsf/newtxsf.sty b/Master/texmf-dist/tex/latex/newtxsf/newtxsf.sty index 1d4fc672114..b664bcc04a0 100644 --- a/Master/texmf-dist/tex/latex/newtxsf/newtxsf.sty +++ b/Master/texmf-dist/tex/latex/newtxsf/newtxsf.sty @@ -2,8 +2,8 @@ % % Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.04} -\def\filedate{2016/01/11} +\def\fileversion{1.05} +\def\filedate{2016/08/23} \ProvidesPackage{newtxsf} [\filedate\space v\fileversion] @@ -23,6 +23,8 @@ \newcount\tx@Isdigit \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@symbolsC +\newif\iftx@upint %default is sloped +\newif\iftx@smops %default is large binary operators \tx@symbolsCtrue \newif\iftx@frenchm % french math \DeclareOption{nosymbolsc}{\tx@symbolsCfalse} @@ -32,6 +34,8 @@ \DeclareOption{uprightGreek}{\tx@slantedGfalse} \DeclareOption{slantedGreek}{\tx@slantedGtrue} \DeclareOption{frenchmath}{\tx@frenchmtrue} +\DeclareOption{upint}{\tx@upinttrue} +\DeclareOption{smallerops}{\tx@smopstrue} \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* @@ -74,16 +78,17 @@ amssymbols,uprightGreek} %%%%%%%%%%%%%%% % Math Symbol % %%%%%%%%%%%%%%% +\DeclareFontEncoding{LMS}{}{} +\DeclareFontSubstitution{LMS}{ntxsy}{m}{n} -\DeclareSymbolFont{symbols}{OMS}{ntxsy}{m}{n} -\SetSymbolFont{symbols}{bold}{OMS}{ntxsy}{b}{n} -\DeclareFontSubstitution{OMS}{ntxsy}{m}{n} +\DeclareSymbolFont{symbols}{LMS}{ntxsy}{m}{n} +\SetSymbolFont{symbols}{bold}{LMS}{ntxsy}{b}{n} \DeclareSymbolFontAlphabet{\symb@ls@lph@}{symbols} \ifx\AmSfont\@undefined\else \renewcommand{\AmSfont}{{% - \usefont{OMS}{ntxsy}{\if\@xp\@car\f@series\@nil bb\else m\fi}{n}}} + \usefont{LMS}{ntxsy}{\if\@xp\@car\f@series\@nil bb\else m\fi}{n}}} \fi @@ -220,34 +225,43 @@ amssymbols,uprightGreek} %\DeclareMathSymbol{\mathdollar}{\mathord}{operators}{36} %\def\mathsterling{\mathit{\mathchar"7024}} %Change the following two so we can adjust metrics in math mode -\DeclareMathDelimiter{(}{\mathopen}{operators}{40}{largesymbols}{130} -\DeclareMathDelimiter{)}{\mathclose}{operators}{41}{largesymbols}{131} -%\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{\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}{lettersA}{166}{largesymbols}{141} + \DeclareMathDelimiter{\rangle}{\mathclose}{symbols}{105}{largesymbols}{11} %\DeclareMathDelimiter{>}{\mathclose}{letters}{62}{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} + \DeclareMathSymbol{\mid}{\mathrel}{symbols}{106} + \DeclareMathDelimiter{|}{\mathord}{symbols}{106}{largesymbols}{12} + \DeclareMathDelimiter{\arrowvert}{\mathord}{symbols}{106}{largesymbols}{60}% 60 + \DeclareMathDelimiter{\vert}{\mathord}{symbols}{106}{largesymbols}{12} + \DeclareMathSymbol{\parallel}{\mathrel}{symbols}{107} + \DeclareMathDelimiter{\Arrowvert}{\mathord}{symbols}{107}{largesymbols}{61}%61 + \DeclareMathDelimiter{\Vert}{\mathord}{symbols}{107}{largesymbols}{13} \let\|=\Vert - \DeclareMathDelimiter{\updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{63} - \DeclareMathDelimiter{\Updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{119} + \DeclareMathDelimiter{\updownarrow}{\mathrel}{symbols}{108}{largesymbols}{63} + \DeclareMathDelimiter{\Updownarrow}{\mathrel}{symbols}{109}{largesymbols}{119} \DeclareMathDelimiter{\llbracket}{\mathopen}{lettersA}{251}{largesymbolsTXA}{18} + \let\lBrack=\llbracket \DeclareMathDelimiter{\rrbracket}{\mathclose}{lettersA}{252}{largesymbolsTXA}{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} \re@DeclareMathSymbol{\varkappa}{\mathord}{lettersA}{40} \re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{41} \re@DeclareMathSymbol{\nabla}{\mathord}{lettersA}{43} @@ -279,7 +293,10 @@ amssymbols,uprightGreek} \re@DeclareMathAccent{\hat}{\mathord}{lettersA}{223} \re@DeclareMathAccent{\dot}{\mathord}{lettersA}{224} \re@DeclareMathAccent{\tilde}{\mathord}{lettersA}{219} -\re@DeclareMathAccent{\ddot}{\mathord}{lettersA}{220} +\re@DeclareMathAccent{\dot}{\mathalpha}{symbols}{219} +\re@DeclareMathAccent{\ddot}{\mathalpha}{symbols}{220} +\re@DeclareMathAccent{\dddot}{\mathord}{symbols}{221} +\re@DeclareMathAccent{\ddddot}{\mathord}{symbols}{222} % \iftx@slantedG \re@DeclareMathSymbol{\Gamma}{\mathalpha}{letters}{0} @@ -487,10 +504,8 @@ amssymbols,uprightGreek} \DeclareMathSymbol{\grouplua}{\mathord}{largesymbols}{166} \DeclareMathSymbol{\grouprua}{\mathord}{largesymbols}{167} % Override default definitions of \widehat and \widetilde -%\re@DeclareMathAccent{\widehat}{\mathalpha}{largesymbols}{98} -%\re@DeclareMathAccent{\widetilde}{\mathalpha}{largesymbols}{101} -\xdef\widehat#1{\mathaccent"0\hexnumber@\symlargesymbols 62{#1}} -\xdef\widetilde#1{\mathaccent"0\hexnumber@\symlargesymbols 65{#1}} +\re@DeclareMathAccent{\widehat}{\mathalpha}{largesymbols}{98} +\re@DeclareMathAccent{\widetilde}{\mathalpha}{largesymbols}{101} \def\overgroup#1{\mathop{\vbox{\ialign{##\crcr\noalign{\kern.4\p@}% \downgroupfill\crcr\noalign{\kern1.5\p@\nointerlineskip}% @@ -544,6 +559,220 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % \widearc, \wideOarc \DeclareMathAccent{\widearc}{\mathalpha}{largesymbols}{175} \DeclareMathAccent{\wideOarc}{\mathalpha}{largesymbols}{180} + +\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}{largesymbolsTXA}{"40} +\re@DeclareMathSymbol{\varointclockwiseslop} {\mathop}{largesymbolsTXA}{"42} +\re@DeclareMathSymbol{\ointctrclockwiseslop} {\mathop}{largesymbolsTXA}{"44} +\re@DeclareMathSymbol{\sumintslop} {\mathop}{largesymbolsTXA}{"46} +\re@DeclareMathSymbol{\iiiintslop} {\mathop}{largesymbolsTXA}{"48} +\re@DeclareMathSymbol{\fintslop} {\mathop}{largesymbolsTXA}{"4A} +\re@DeclareMathSymbol{\sqintslop} {\mathop}{largesymbolsTXA}{"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}{largesymbolsTXA}{"08} +\re@DeclareMathSymbol{\varointclockwiseupop} {\mathop}{largesymbolsTXA}{"0A} +\re@DeclareMathSymbol{\ointctrclockwiseupop} {\mathop}{largesymbolsTXA}{"0C} +\re@DeclareMathSymbol{\sumintupop} {\mathop}{largesymbolsTXA}{"0E} +\re@DeclareMathSymbol{\iiiintupop} {\mathop}{largesymbolsTXA}{"21} +\re@DeclareMathSymbol{\fintupop} {\mathop}{largesymbolsTXA}{"23} +\re@DeclareMathSymbol{\sqintupop} {\mathop}{largesymbolsTXA}{"25} + +\iftx@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@} + +\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@} + +\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@} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Math extension options +%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\iftx@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}{largesymbolsTXA}{"00} +\re@DeclareMathSymbol{\bigsqcupplusop}{\mathop}{largesymbolsTXA}{"02} +\re@DeclareMathSymbol{\bigsqcapplusop}{\mathop}{largesymbolsTXA}{"04} +\re@DeclareMathSymbol{\bigsqcapop}{\mathop}{largesymbolsTXA}{"06} +\re@DeclareMathSymbol{\bigtimesop}{\mathop}{largesymbolsTXA}{"10} +\re@DeclareMathSymbol{\coprodop}{\mathop}{largesymbols}{"60} +%\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsTXA}{0} +%\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsTXA}{2} +%\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsTXA}{4} +%\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsTXA}{6} +%\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsTXA}{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}{largesymbolsTXA}{"28} +\re@DeclareMathSymbol{\bigsqcupplusop}{\mathop}{largesymbolsTXA}{"2A} +\re@DeclareMathSymbol{\bigsqcapplusop}{\mathop}{largesymbolsTXA}{"2C} +\re@DeclareMathSymbol{\bigsqcapop}{\mathop}{largesymbolsTXA}{"2E} +\re@DeclareMathSymbol{\bigtimesop}{\mathop}{largesymbolsTXA}{"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 A Definitions % AMSa %%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1043,6 +1272,29 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %\DeclareMathSymbol{\wp}{\mathord}{letters}{125} %\DeclareMathAccent{\vec}{\mathord}{letters}{126} %"7F +%Added in version 1.5 +\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 (ntxmia) Definition % lettersA @@ -1340,23 +1592,26 @@ $\hfil\displaystyle{#1}\hfil$\crcr% % Math Extension A (ntxexa) Definition % largesymbolsTXA %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsTXA}{0} -\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsTXA}{2} -\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsTXA}{4} -\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsTXA}{6} -\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsTXA}{16} +%\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsTXA}{0} +%\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsTXA}{2} +%\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsTXA}{4} +%\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsTXA}{6} +%\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsTXA}{16} %\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18} %\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19} -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbols}{168} +\re@DeclareMathSymbol{\br@cext}{\mathord}{symbols}{168} +\DeclareMathSymbol{\smallprod}{\mathop}{symbols}{"98} +\DeclareMathSymbol{\smallsum}{\mathop}{symbols}{"99} +\DeclareMathSymbol{\smallcoprod}{\mathop}{symbols}{113}% % -\iftx@cmint - \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbols}{150} - \re@DeclareMathSymbol{\intop}{\mathop}{largesymbols}{152} +%\iftx@cmint +% \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbols}{150} +% \re@DeclareMathSymbol{\intop}{\mathop}{largesymbols}{152} % \ifx\AmSfont\@undefined % \def\oint{\ointop\nolimits} % \def\int{\intop\nolimits} % \fi -\else % use tx integrals +%\else % use tx integrals % \ifx\AmSfont\@undefined\else % % The following are needed if amsmath has been loaded % \let\iint\relax @@ -1367,51 +1622,51 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %\renewcommand{\iint}{\DOTSI\protect\MultiIntegral{2}} %\renewcommand{\iiint}{\DOTSI\protect\MultiIntegral{3}} %\renewcommand{\iiiint}{\DOTSI\protect\MultiIntegral{4}} -\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsTXA}{8} - \def\oiint{\oiintop\ilimits@} -\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsTXA}{10} - \def\ointctrclockwise{\ointctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsTXA}{12} - \def\ointclockwise{\ointclockwiseop\ilimits@} -\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsTXA}{14} - \def\sqint{\sqintop\ilimits@} -\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsTXA}{33} - \def\iint{\iintop\ilimits@} -\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsTXA}{35} - \def\iiint{\iiintop\ilimits@} -\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsTXA}{37} - \def\iiiint{\iiiintop\ilimits@} -\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsTXA}{39} - \def\idotsint{\idotsintop\ilimits@} -\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsTXA}{41} - \def\oiiint{\oiiintop\ilimits@} -\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsTXA}{43} - \def\varointctrclockwise{\varointctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsTXA}{45} - \def\varointclockwise{\varointclockwiseop\ilimits@} -\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsTXA}{62} - \def\fint{\fintop\ilimits@} -\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsTXA}{64} - \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsTXA}{66} - \def\varoiintclockwise{\varoiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{68} - \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsTXA}{70} - \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsTXA}{72} - \def\oiintclockwise{\oiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsTXA}{74} - \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsTXA}{76} - \def\oiiintclockwise{\oiiintclockwiseop\ilimits@} -\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{78} - \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@} -\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsTXA}{80} - \def\sqiint{\sqiintop\ilimits@} -\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsTXA}{82} - \def\sqiiint{\sqiiintop\ilimits@} -\fi +%\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsTXA}{8} +% \def\oiint{\oiintop\ilimits@} +%\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsTXA}{10} +% \def\ointctrclockwise{\ointctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsTXA}{12} +% \def\ointclockwise{\ointclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsTXA}{14} +% \def\sqint{\sqintop\ilimits@} +%\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsTXA}{33} +% \def\iint{\iintop\ilimits@} +%\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsTXA}{35} +% \def\iiint{\iiintop\ilimits@} +%\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsTXA}{37} +% \def\iiiint{\iiiintop\ilimits@} +%\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsTXA}{39} +% \def\idotsint{\idotsintop\ilimits@} +%\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsTXA}{41} +% \def\oiiint{\oiiintop\ilimits@} +%\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsTXA}{43} +% \def\varointctrclockwise{\varointctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsTXA}{45} +% \def\varointclockwise{\varointclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsTXA}{62} +% \def\fint{\fintop\ilimits@} +%\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsTXA}{64} +% \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsTXA}{66} +% \def\varoiintclockwise{\varoiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{68} +% \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsTXA}{70} +% \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsTXA}{72} +% \def\oiintclockwise{\oiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsTXA}{74} +% \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsTXA}{76} +% \def\oiiintclockwise{\oiiintclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsTXA}{78} +% \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@} +%\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsTXA}{80} +% \def\sqiint{\sqiintop\ilimits@} +%\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsTXA}{82} +% \def\sqiiint{\sqiiintop\ilimits@} +%\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1492,7 +1747,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %%% %%% for AMS classes %%% -\chardef\newtxsf@openbox 131 % was 3 in +\chardef\newtxsf@openbox 131 % was 3 in ntxsya \DeclareRobustCommand{\textsquare}{\begingroup \usefont{U}{ntxsym}{m}{n}\newtxsf@openbox\endgroup} \DeclareRobustCommand{\openbox}{} -- cgit v1.2.3