summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-16 00:07:19 +0000
committerKarl Berry <karl@freefriends.org>2013-10-16 00:07:19 +0000
commit0e1db9a175dc6e40e5975bd72684d0caf449ed3a (patch)
tree27dad53d20f8138dfecd38c77a49d54eceaca1c0 /Master/texmf-dist/tex/latex/newtx
parent5c9c1f5138b68b20bb4715a6f7bd398bd3a652e6 (diff)
newtx (15oct13)
git-svn-id: svn://tug.org/texlive/trunk@31911 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd20
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty42
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty4
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd20
-rw-r--r--Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd20
5 files changed, 88 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd b/Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd
new file mode 100644
index 00000000000..3b65577a19c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/newtx/ly1minlibertine.fd
@@ -0,0 +1,20 @@
+\ProvidesFile{ly1minlibertine.fd}[2013/10/12 v1.0]
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty%
+\fi
+
+ \DeclareFontFamily{LY1}{minlibertine}{}
+ \DeclareFontShape{LY1}{minlibertine}{m}{n}{
+ <-> \ntxmath@scaled MinLibReg-ly1
+ }{}
+ \DeclareFontShape{LY1}{minlibertine}{b}{n}{
+ <-> \ntxmath@scaled MinLibBol-ly1
+ }{}
+ \DeclareFontShape{LY1}{minlibertine}{m}{it}{
+ <-> \ntxmath@scaled MinLibIta-ly1
+ }{}
+ \DeclareFontShape{LY1}{minlibertine}{b}{it}{
+ <-> \ntxmath@scaled MinLibBolIta-ly1
+ }{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 6ce308f8c9b..d68a351d058 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.141}
-\def\filedate{2013/09/30}
+\def\fileversion{1.15}
+\def\filedate{2013/10/12}
\ProvidesPackage{newtxmath}
[\filedate\space v\fileversion]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -21,9 +21,18 @@
\csname newtxmathLoaded\endcsname
\let\newtxmathLoaded\endinput
\RequirePackage{amsmath} % improves extendable delimiter handling
+\RequirePackage{ifxetex,ifluatex,xkeyval}
+
+\newif\ifxl@otf \xl@otffalse
+\ifxetex
+ \xl@otftrue
+\else\ifluatex
+ \xl@otftrue
+ \fi
+\fi
+\newcommand{\cmr@default}{cmr}
\input{binhex}
-\RequirePackage{xkeyval}
\let\ntxmath@scaled\@empty
\define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}}
\DeclareOption*{%
@@ -69,29 +78,30 @@ amssymbols,uprightGreek}
% altnu and largelibfigs valid only with libertine
\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\fi
% Use existing text fonts for operators, mathrm, etc
-\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n}
-\iftx@libertine
- \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{sb}{n}
-\else
- \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n}
+\ifxl@otf
+ \iftx@libertine
+ \ifx\rmdefault\cmr@default
+ \renewcommand{\rmdefault}{minlibertine}% since can't load libertine twice
+ \fi
+ \fi
\fi
+\edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi}
+\DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n}
+\SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{n}
+
\def\operator@font{\mathgroup\symoperators}
+\DeclareSymbolFontAlphabet{\mathrm}{operators}
+
\DeclareMathAlphabet{\mathsf}{\encodingdefault}{\sfdefault}{m}{n}
\DeclareMathAlphabet{\mathit}{\encodingdefault}{\rmdefault}{m}{it}
\DeclareMathAlphabet{\mathtt}{\encodingdefault}{\ttdefault}{m}{n}
\DeclareSymbolFontAlphabet{\mathrm}{operators}
-\iftx@libertine
- \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{sb}{n}
- \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{sb}{it}
-\else
- \DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{b}{n}
- \SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{b}{it}
-\fi
+\DeclareMathAlphabet{\mathbf}{\encodingdefault}{\rmdefault}{\bold@wt}{n}
+\SetMathAlphabet{\mathit}{bold}{\encodingdefault}{\rmdefault}{\bold@wt}{it}
\SetMathAlphabet{\mathsf}{bold}{\encodingdefault}{\sfdefault}{b}{n}
\SetMathAlphabet{\mathtt}{bold}{\encodingdefault}{\ttdefault}{b}{n}
-
%%%%%%%%%%%%%%%
% Math Italic %
%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 3ee2b63f939..5fdbb31aaf5 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.141}
-\def\filedate{2013/09/30}
+\def\fileversion{1.15}
+\def\filedate{2013/10/12}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
diff --git a/Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd b/Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd
new file mode 100644
index 00000000000..331ffc93ebb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/newtx/ot1minlibertine.fd
@@ -0,0 +1,20 @@
+\ProvidesFile{ot1minlibertine.fd}[2013/10/12 v1.0]
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty%
+\fi
+
+ \DeclareFontFamily{OT1}{minlibertine}{}
+ \DeclareFontShape{OT1}{minlibertine}{m}{n}{
+ <-> \ntxmath@scaled MinLibReg-ot1
+ }{}
+ \DeclareFontShape{OT1}{minlibertine}{b}{n}{
+ <-> \ntxmath@scaled MinLibBol-ot1
+ }{}
+ \DeclareFontShape{OT1}{minlibertine}{m}{it}{
+ <-> \ntxmath@scaled MinLibIta-ot1
+ }{}
+ \DeclareFontShape{OT1}{minlibertine}{b}{it}{
+ <-> \ntxmath@scaled MinLibBolIta-ot1
+ }{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd b/Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd
new file mode 100644
index 00000000000..b98ae5431f5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/newtx/t1minlibertine.fd
@@ -0,0 +1,20 @@
+\ProvidesFile{t1minlibertine.fd}[2013/10/12 v1.0]
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty%
+\fi
+
+ \DeclareFontFamily{T1}{minlibertine}{}
+ \DeclareFontShape{T1}{minlibertine}{m}{n}{
+ <-> \ntxmath@scaled MinLibReg-t1
+ }{}
+ \DeclareFontShape{T1}{minlibertine}{b}{n}{
+ <-> \ntxmath@scaled MinLibBol-t1
+ }{}
+ \DeclareFontShape{T1}{minlibertine}{m}{it}{
+ <-> \ntxmath@scaled MinLibIta-t1
+ }{}
+ \DeclareFontShape{T1}{minlibertine}{b}{it}{
+ <-> \ntxmath@scaled MinLibBolIta-t1
+ }{}
+
+\endinput