newtx (29dec)

git-svn-id: svn://tug.org/texlive/trunk@32512 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 78 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index c0ffe1cfb1d..0ed1c13743b 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.17}
-\def\filedate{2013/12/11}
+\def\fileversion{1.18}
+\def\filedate{2013/12/28}
 \ProvidesPackage{newtxmath}
 	[\filedate\space v\fileversion]
 \@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -194,7 +194,6 @@ amssymbols,uprightGreek}
 \DeclareFontShape{LMX}{ntxexx}{bx}{n}{<->ssub ntxexx/b/n}{}
 \DeclareSymbolFont{largesymbols}{LMX}{ntxexx}{m}{n}
 \SetSymbolFont{largesymbols}{bold}{LMX}{ntxexx}{b}{n}
-
 \iftx@bigdelims
     %default definitions of \big etc need some changes
     %\renewcommand{\big}{\bBigg@\@ne}
@@ -312,6 +311,9 @@ amssymbols,uprightGreek}
    \let\|=\Vert
   \DeclareMathDelimiter{\updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{63}
   \DeclareMathDelimiter{\Updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{119}
+  \DeclareMathDelimiter{\llbracket}{\mathopen}{lettersA}{251}{largesymbolsTXA}{18}
+  \DeclareMathDelimiter{\rrbracket}{\mathclose}{lettersA}{252}{largesymbolsTXA}{19}
+
 \else
   \iftx@braces
     \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{142}
@@ -547,6 +549,68 @@ amssymbols,uprightGreek}
 %    \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9}
 %  \fi
 %\fi
+% 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}
+% Override default definitions of \widehat and \widetilde
+\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}%
+$\hfil\displaystyle{#1}\hfil$\crcr}}}\limits}
+%
+\def\undergroup#1{\mathop{\vtop{\ialign{##\crcr%
+$\hfil\displaystyle{#1}\hfil$\crcr%
+\noalign{\kern1.5\p@\nointerlineskip}%
+\upgroupfill\crcr\noalign{\kern.5\p@}}}}\limits}
+%
+\def\downgroupfill{$\m@th%
+   \groupld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\grouprd$}
+%
+\def\upgroupfill{$\m@th%
+   \grouplu\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\groupru$}
+% same thing but with arrows
+\def\overgroupra#1{\mathop{\vbox{\ialign{##\crcr\noalign{\kern.4\p@}%
+\downgroupfillra\crcr\noalign{\kern1.5\p@\nointerlineskip}%
+$\hfil\displaystyle{#1}\hfil$\crcr}}}\limits}
+%
+\def\undergroupra#1{\mathop{\vtop{\ialign{##\crcr%
+$\hfil\displaystyle{#1}\hfil$\crcr%
+\noalign{\kern1.5\p@\nointerlineskip}%
+\upgroupfillra\crcr\noalign{\kern.5\p@}}}}\limits}
+%
+\def\overgroupla#1{\mathop{\vbox{\ialign{##\crcr\noalign{\kern.4\p@}%
+\downgroupfillla\crcr\noalign{\kern1.5\p@\nointerlineskip}%
+$\hfil\displaystyle{#1}\hfil$\crcr}}}\limits}
+%
+\def\undergroupla#1{\mathop{\vtop{\ialign{##\crcr%
+$\hfil\displaystyle{#1}\hfil$\crcr%
+\noalign{\kern1.5\p@\nointerlineskip}%
+\upgroupfillla\crcr\noalign{\kern.5\p@}}}}\limits}
+%
+\def\downgroupfillra{$\m@th%
+   \groupld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\grouprda$}
+%
+\def\upgroupfillra{$\m@th%
+   \grouplu\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\grouprua$}
+%
+\def\downgroupfillla{$\m@th%
+   \grouplda\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\grouprd$}
+%
+\def\upgroupfillla{$\m@th%
+   \grouplua\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu\groupru$}
+
+
+% Place a ring over an overgroup symbol, like yhmath \widering
+\newcommand{\widering}[1]{\overset{\smash{\vbox to .2ex{%
+    \hbox{$\mathring{}$}}}}{\overgroup{#1}}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Math Symbol A Definitions % AMSa
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -933,8 +997,10 @@ amssymbols,uprightGreek}
 \re@DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123}
 \re@DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124}
 \re@DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125}
-\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18}
-\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19}
+\iftx@bigdelims\else
+  \re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18}
+  \re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19}
+\fi
 \re@DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128}
 \re@DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129}
 \re@DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130}
@@ -963,6 +1029,10 @@ amssymbols,uprightGreek}
 \re@DeclareMathSymbol{\multimapdotbothBvert}{\mathrel}{symbolsC}{151}
 \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}}}
+
 % Changes to put some symbolsC glyphs into lettersA
 \re@DeclareMathSymbol{\nsubset}{\mathrel}{lettersA}{54}
 \re@DeclareMathSymbol{\nsupset}{\mathrel}{lettersA}{55}
@@ -1250,7 +1320,7 @@ amssymbols,uprightGreek}
 \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}{largesymbolsTXA}{32}
+\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbols}{168}
 %
 \iftx@cmint
   \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbols}{150}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index d15960a586f..d97d91713bd 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -13,8 +13,8 @@
 % Added scaled keyword and osf option;
 % Modified the definition of \k to bypass problem with grouping;
 
-\def\fileversion{1.17}
-\def\filedate{2013/12/11}
+\def\fileversion{1.18}
+\def\filedate{2013/12/28}
 \ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
 
 \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}